5 files changed, 64 insertions, 2 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 87d2681..ce8f053 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -30,6 +30,7 @@ class NodesController < ApplicationController
     @node = Node.new node_params
     @selected_kind = CccConventions::NODE_KINDS.key?(params[:kind]) ? params[:kind] : "generic"
     @parent = Node.find(params[:parent_id]) if params.has_key?(:parent_id)
+    @attach_asset = Asset.find(params[:asset_id]) if params.has_key?(:asset_id)
   end
 
   def create
@@ -51,10 +52,19 @@ class NodesController < ApplicationController
                           :action => "create",
                           :title => params[:title], :path => @node.unique_name)
 
+      if params[:asset_id].present? && (asset = Asset.find(params[:asset_id]))
+        result = @node.attach_asset!(asset, :user => current_user,
+                                      :headline => params[:asset_headline].present?)
+        flash[:notice] = "Page created with “#{asset.name}” attached."
+        flash[:notice] += " It is the page's headline." if result[:headline] == :set
+        flash[:error]   = "This asset type cannot be a headline." if result[:headline] == :not_eligible
+      end
+
       redirect_to(edit_node_path(@node))
     else
       @selected_kind = CccConventions::NODE_KINDS.key?(params[:kind]) ? params[:kind] : "generic"
       @parent = Node.find(params[:parent_id]) if params.has_key?(:parent_id)
+      @attach_asset = Asset.find(params[:asset_id]) if params.has_key?(:asset_id)
       render :new
     end
   end
diff --git a/app/models/asset.rb b/app/models/asset.rb
index ba9c2f0..73970e2 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -31,4 +31,13 @@ class Asset < ApplicationRecord
   def show_credit?
     image? && has_credit?
   end
+
+  # Nodes whose current lifecycle rows (head, draft or autosave) carry
+  # this asset. Historical revisions also hold RelatedAsset rows; they
+  # are excluded by construction here, since nothing points at them.
+  def attached_nodes
+    page_ids = related_assets.select(:page_id)
+    Node.where("head_id IN (:ids) OR draft_id IN (:ids) OR autosave_id IN (:ids)",
+               :ids => page_ids).distinct
+  end
 end
diff --git a/app/views/assets/show.html.erb b/app/views/assets/show.html.erb
index e551e35..2723821 100644
--- a/app/views/assets/show.html.erb
+++ b/app/views/assets/show.html.erb
@@ -21,6 +21,31 @@
       <div class="node_content"><%= image_tag @asset.upload.url(:medium), style: "max-width: 300px; max-height: 300px;" %></div>
     <% end %>
 
+    <div class="node_description">Attached to</div>
+    <div class="node_content">
+      <% nodes = @asset.attached_nodes %>
+      <% if nodes.any? %>
+        <ul class="search_results_list">
+          <% nodes.each do |node| %>
+            <li>
+              <%= link_to node.title, node_path(node) %>
+              <% if node.editable_page&.headline_asset == @asset %>
+                <%= icon("star", library: "tabler", "aria-hidden": true) %>
+              <% end %>
+              <% unless node.head && node.head.related_assets.exists?(:asset_id => @asset.id) %>
+                <span class="field_hint">pending versions only</span>
+              <% end %>
+            </li>
+          <% end %>
+        </ul>
+      <% else %>
+        — not attached to any page —
+      <% end %>
+      <%= link_to new_node_path(:asset_id => @asset.id), :class => "action_button" do %>
+        <%= icon("file-plus", library: "tabler", "aria-hidden": true) %> New page with this attachment
+      <% end %>
+    </div>
+
     <div class="node_description">Public Path</div>
     <div class="node_content">
       <% public_path = @asset.upload.url.sub(/\?\d+$/, "") %>
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb
index 805fbc9..1303e9e 100644
--- a/app/views/nodes/new.html.erb
+++ b/app/views/nodes/new.html.erb
@@ -48,6 +48,24 @@
     <span class="field_hint">This preview updates as you type. The final path can still be changed afterward by editing the title (for the last segment) or moving the node to a different parent (for everything before it).</span>
   </div>
 
+  <% if @attach_asset %>
+    <div class="node_description">attachment</div>
+    <div class="node_content">
+      <ul class="thumbnail_list">
+        <li>
+          <% if @attach_asset.has_variant?(:thumb) %>
+            <%= image_tag @attach_asset.upload.url(:thumb) %>
+          <% end %>
+          <%= link_to @attach_asset.name, asset_path(@attach_asset),
+                :target => "_blank", :rel => "noopener" %>
+        </li>
+      </ul>
+      <span class="field_hint">This asset will automatically be attached to the new page.</span>
+      <label><%= check_box_tag :asset_headline, "1" %> as the page's headline</label>
+      <%= hidden_field_tag :asset_id, @attach_asset.id %>
+    </div>
+  <% end %>
+
   <div class="node_description"></div>
   <div class="node_content"><%= submit_tag "Create" %></div>
 
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index b8f9278..55da524 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -409,7 +409,7 @@ class NodesControllerTest < ActionController::TestCase
 
     get :show, params: { id: node.id }
     assert_response :success
-    assert_select "a", text: "add event"
+    assert_select "a", text: "Add event"
     assert_select "a[href*='tag_list=open-day']"
     assert_select "a[href*='auto_tag_source=erfa-detail']"
   end
@@ -420,7 +420,7 @@ class NodesControllerTest < ActionController::TestCase
 
     get :show, params: { id: node.id }
     assert_response :success
-    assert_select "a", text: "add event"
+    assert_select "a", text: "Add event"
     assert_select "a[href*='tag_list=']", count: 0
   end