1 files changed, 34 insertions, 15 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 4f72744..494887d 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -4,8 +4,8 @@ class NodesController < ApplicationController
   
   layout 'admin'
   
-  before_filter :login_required
-  before_filter :find_node, :only => [
+  before_action :login_required
+  before_action :find_node, :only => [
                               :show, 
                               :edit, 
                               :update, 
@@ -15,16 +15,17 @@ class NodesController < ApplicationController
                             ]
 
   def index
-    @nodes = Node.root.descendants.paginate( 
-      :include => [:head, :draft],
-      :page => params[:page], 
-      :per_page => 25,
-      :order => 'id DESC'
-    )
+    @nodes = Node.root.descendants.includes(:head, :draft)
+      .order('id DESC')
+      .paginate(:page => params[:page], :per_page => 25)
   end
 
   def new
-    @node = Node.new params[:node]
+    @node = Node.new node_params
+    if params.has_key?(:parent_id)
+      @parent_id = params[:parent_id]
+      @parent_name = Node.find(@parent_id).title
+    end
   end
   
   def create
@@ -33,9 +34,16 @@ class NodesController < ApplicationController
     @node = Node.new
     @node.parent_id = find_parent
     @node.slug = params[:title].parameterize.to_s
-    
+   
     if @node.save
-      @node.draft.update_attributes(:title => params[:title])
+      @node.draft.update(:title => params[:title])
+      case params[:kind]
+        when "update"
+          @node.draft.tag_list.add("update")
+        when "press_release"
+          @node.draft.tag_list.add("update", "pressemitteilung")
+      end
+      @node.draft.save!
       redirect_to(edit_node_path(@node))
     else
       render :new
@@ -44,6 +52,7 @@ class NodesController < ApplicationController
   
   def show
     node = Node.find(params[:id])
+    node.wipe_draft!
     @page = node.draft || node.head
   end
 
@@ -53,7 +62,7 @@ class NodesController < ApplicationController
     rescue LockedByAnotherUser => e
       flash[:error] = e.message
       if request.referer
-        redirect_to :back
+        redirect_to request.referer || node_path(@node)
       else
         redirect_to node_path(@node)
       end
@@ -61,10 +70,10 @@ class NodesController < ApplicationController
   end
 
   def update
-    @node.update_attributes(params[:node])
+    @node.update(node_params)
     @draft = @node.find_or_create_draft current_user
     @draft.tag_list = params[:tag_list]
-    if @draft.update_attributes( params[:page] )
+    if @draft.update( page_params )
       flash[:notice] = "Draft has been saved: #{Time.now}"
       respond_to do |format|
         format.html { redirect_to edit_node_path(@node) }
@@ -82,7 +91,7 @@ class NodesController < ApplicationController
   def publish
     @node.publish_draft!
     flash[:notice] = "Draft has been published"
-    redirect_to node_path
+    redirect_to node_path(@node)
   end
   
   def unlock
@@ -96,6 +105,14 @@ class NodesController < ApplicationController
   end
   
   private
+
+    def node_params
+      params.fetch(:node, {}).permit(:slug, :parent_id, :staged_slug, :staged_parent_id)
+    end
+
+    def page_params
+      params.fetch(:page, {}).permit(:title, :abstract, :body, :template_name, :published_at, :user_id)
+    end
   
     def find_node
       @node = Node.find(params[:id])
@@ -107,6 +124,8 @@ class NodesController < ApplicationController
         Node.root.id
       when "update"
         Update.find_or_create_parent.id
+      when "press_release"
+        Update.find_or_create_parent.id
       when "generic"
         if params[:parent_id] && Node.find(params[:parent_id])
           params[:parent_id]