1 files changed, 11 insertions, 5 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 6caa827..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
@@ -77,7 +87,7 @@ class NodesController < ApplicationController
         "This page has unsaved changes from a previous session, shown below. " \
         "Save to keep them, or use \"Discard Autosave\" below to go back to the last saved version."
     elsif freshly_locked
-      flash.now[:notice] = "Node locked and ready to edit"
+      flash.now[:notice] ||= "Node locked and ready to edit"
     end
   rescue LockedByAnotherUser => e
     flash[:error] = e.message
@@ -223,10 +233,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)