6 files changed, 53 insertions, 18 deletions

diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index d150e06..fbede0a 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -28,6 +28,7 @@ class AssetsController < ApplicationController
   # GET /assets/new.xml
   def new
     @asset = Asset.new
+    @attach_node = Node.not_in_trash.find_by(:id => params[:node_id]) if params[:node_id].present?
 
     respond_to do |format|
       format.html # new.html.erb
@@ -44,10 +45,12 @@ class AssetsController < ApplicationController
   # POST /assets.xml
   def create
     @asset = Asset.new(asset_params)
+    attach_node = Node.not_in_trash.find_by(:id => params[:node_id]) if params[:node_id].present?
 
     respond_to do |format|
       if @asset.save
         flash[:notice] = 'Asset was successfully created.'
+        attach_to(attach_node) if attach_node
         format.html { redirect_to(@asset) }
         format.xml  { render :xml => @asset, :status => :created, :location => @asset }
       else
@@ -89,6 +92,25 @@ class AssetsController < ApplicationController
   private
 
     def asset_params
-      params.require(:asset).permit(:name, :upload)
+      params.require(:asset).permit(:name, :upload, :creator, :source_url, :license_key)
+    end
+
+    def attach_to node
+      result = node.attach_asset!(@asset, :user => current_user,
+                                   :headline => params[:headline].present?)
+      flash[:notice] =
+        if result[:attached].zero?
+          "Asset saved — it was already attached to “#{node.title}”."
+        else
+          "Asset was successfully created and attached to “#{node.title}”."
+        end
+      case result[:headline]
+      when :set           then flash[:notice] += " It is now the page's headline."
+      when :kept_existing then flash[:headline_kept_path] = node_path(node)
+      when :not_eligible  then flash[:error] = "This asset type cannot be a headline."
+      end
+    rescue LockedByAnotherUser
+      flash[:locked_by]        = node.lock_owner&.login
+      flash[:locked_node_path] = node_path(node)
     end
 end
diff --git a/app/controllers/csp_reports_controller.rb b/app/controllers/csp_reports_controller.rb
index a8f8edb..5a3b55e 100644
--- a/app/controllers/csp_reports_controller.rb
+++ b/app/controllers/csp_reports_controller.rb
@@ -12,9 +12,9 @@ class CspReportsController < ApplicationController
     if report
       directive = report["effective-directive"] || report["violated-directive"]
       at = (URI.parse(report["document-uri"]).path rescue "unparsed")
-      Rails.logger.warn("CSP violation: #{directive} blocked=#{report['blocked-uri']} at=#{at}")
+      CSP_LOGGER.warn("CSP violation: #{directive} blocked=#{report['blocked-uri']} at=#{at}")
     else
-      Rails.logger.warn("CSP violation: unparseable report (#{raw.to_s.bytesize} bytes)")
+      CSP_LOGGER.warn("CSP violation: unparseable report (#{raw.to_s.bytesize} bytes)")
     end
 
     head :no_content
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 6caa827..9c84420 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -223,10 +223,6 @@ class NodesController < ApplicationController
     @nodes = index_matching(Node.drafts_and_autosaves)
   end
 
-  def recent
-    @nodes = index_matching(Node.recently_changed)
-  end
-
   def mine
     base = Node.joins(:pages)
       .where("pages.user_id = ? or pages.editor_id = ?", current_user, current_user)
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 2d08dea..326fbd4 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -6,6 +6,19 @@ class PagesController < ApplicationController
 
   def preview
     @page = Page.find(params[:id])
+    unless @page.node
+      node = Node.find_by(autosave_id: @page.id) ||
+             Node.find_by(draft_id: @page.id) ||
+             Node.find_by(head_id: @page.id)
+      @page.node = node if node
+    end
+
+    node ||= @page.node
+    if node && node.draft_id == @page.id && node.autosave
+      @page = node.autosave
+      @page.node = node
+    end
+
 
     if @page
       template = @page.valid_template
@@ -15,11 +28,4 @@ class PagesController < ApplicationController
       )
     end
   end
-
-  def sort_images
-    page = Page.find(params[:id])
-    page.update_assets(params[:images])
-    
-    head :ok
-  end
 end
diff --git a/app/controllers/related_assets_controller.rb b/app/controllers/related_assets_controller.rb
index 5af73fc..ca894f2 100644
--- a/app/controllers/related_assets_controller.rb
+++ b/app/controllers/related_assets_controller.rb
@@ -5,10 +5,10 @@ class RelatedAssetsController < ApplicationController
   def search
     term = params[:search_term].to_s.strip
     attached_ids = @node.editable_page.related_assets.pluck(:asset_id)
-    scope = Asset.images.where.not(id: attached_ids)
+    scope = Asset.headline_eligible.where.not(id: attached_ids)
 
     results = if term.present?
-      scope.where("name ILIKE ?", "%#{term}%").limit(10)
+      scope.where("name ILIKE :term OR upload_file_name ILIKE :term", term: "%#{term}%").limit(10)
     else
       scope.order(created_at: :desc).limit(5)
     end
@@ -26,6 +26,7 @@ class RelatedAssetsController < ApplicationController
       id: related.id,
       asset_id: asset.id,
       name: asset.name,
+      has_credit: asset.show_credit?,
       thumb_url: asset.upload.url(:thumb),
       large_url: asset.upload.url(:large),
       original_url: asset.upload.url,
@@ -39,7 +40,17 @@ class RelatedAssetsController < ApplicationController
   end
 
   def update
-    @node.editable_page.related_assets.find(params[:id]).insert_at(params[:position].to_i)
+    related = @node.editable_page.related_assets.find(params[:id])
+
+    if params.key?(:headline)
+      RelatedAsset.transaction do
+        @node.editable_page.related_assets.update_all(headline: false)
+        related.update!(headline: true) if params[:headline] == "true"
+      end
+    else
+      related.insert_at(params[:position].to_i)
+    end
+
     head :ok
   end
 
diff --git a/app/controllers/shared_previews_controller.rb b/app/controllers/shared_previews_controller.rb
index f6fb45a..65f744d 100644
--- a/app/controllers/shared_previews_controller.rb
+++ b/app/controllers/shared_previews_controller.rb
@@ -8,7 +8,7 @@ class SharedPreviewsController < ApplicationController
       is_draft = node.draft_id == @page.id
 
       currently_public = is_head && @page.public?
-      superseded        = !is_head && !is_draft
+      superseded       = !is_head && !is_draft
 
       if superseded || currently_public
         redirect_to @page.public_link