3 files changed, 25 insertions, 19 deletions

diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index e58f4f30..4b27d1c4 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -38,7 +38,6 @@ class AssetsController < ApplicationController
   # GET /assets/1/edit
   def edit
     @asset = Asset.find(params[:id])
-    @attach_node = Node.not_in_trash.find_by(:id => params[:node_id]) if params[:node_id].present?
   end
 
   # POST /assets
@@ -69,7 +68,6 @@ class AssetsController < ApplicationController
   # PUT /assets/1.xml
   def update
     @asset = Asset.find(params[:id])
-    @attach_node = Node.not_in_trash.find_by(:id => params[:node_id]) if params[:node_id].present?
 
     respond_to do |format|
       if @asset.update(asset_params)
@@ -102,6 +100,20 @@ class AssetsController < ApplicationController
     end
   end
 
+  # POST /assets/1/attach_to_node
+  def attach_to_node
+    @asset = Asset.find(params[:id])
+    node   = Node.not_in_trash.find_by(:id => params[:node_id])
+
+    if node
+      attach_to(node)
+    else
+      flash[:error] = t("flash.assets.attach_no_node")
+    end
+
+    redirect_to(asset_path(@asset))
+  end
+
   private
 
     def asset_params
diff --git a/app/views/assets/edit.html.erb b/app/views/assets/edit.html.erb
index 5214e082..610ae20a 100644
--- a/app/views/assets/edit.html.erb
+++ b/app/views/assets/edit.html.erb
@@ -36,23 +36,6 @@
               ) %>
       </div>
 
-      <div class="layout_row_label"><%= t("assets.form.attach_to_page") %></div>
-      <div class="layout_row_content">
-        <div class="restore_picker">
-          <%= text_field_tag :asset_node_search_term, @attach_node&.title,
-                :placeholder => t("assets.form.attach_search_placeholder"), :autocomplete => "off" %>
-          <div id="asset_node_search_results" class="search_results" style="display: none"></div>
-        </div>
-        <%= hidden_field_tag :node_id, @attach_node&.id %>
-        <span class="field_hint"><%= t("assets.form.attach_hint") %></span>
-      </div>
-
-      <div class="layout_row_label"></div>
-      <div class="layout_row_content">
-        <label><%= check_box_tag :headline, "1" %> <%= t("assets.form.as_headline") %></label>
-        <span class="field_hint"><%= t("assets.form.headline_hint") %></span>
-      </div>
-
       <div class="layout_row_label"><%= t("admin.columns.actions") %></div>
       <div class="layout_row_content info_group">
         <div class="info_group_items">
diff --git a/app/views/assets/show.html.erb b/app/views/assets/show.html.erb
index d76d312b..f31d34e1 100644
--- a/app/views/assets/show.html.erb
+++ b/app/views/assets/show.html.erb
@@ -47,6 +47,17 @@
       <%= link_to new_node_path(:asset_id => @asset.id), :class => "action_button" do %>
         <%= icon("file-plus", library: "tabler", "aria-hidden": true) %> <%= t(".new_page_with_attachment") %>
       <% end %>
+      <%= form_tag attach_to_node_asset_path(@asset), :class => "asset_attach_form" do %>
+        <div class="restore_picker">
+          <%= text_field_tag :asset_node_search_term, nil,
+                :placeholder => t("assets.form.attach_search_placeholder"), :autocomplete => "off" %>
+          <div id="asset_node_search_results" class="search_results" style="display: none"></div>
+        </div>
+        <%= hidden_field_tag :node_id, nil %>
+        <label><%= check_box_tag :headline, "1" %> <%= t("assets.form.as_headline") %></label>
+        <%= submit_tag t(".attach_button") %>
+        <span class="field_hint"><%= t("assets.form.attach_hint") %></span>
+      <% end %>
     </div>
 
     <div class="layout_row_label"><%= t(".public_path") %></div>