1 files changed, 14 insertions, 2 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