2 files changed, 30 insertions, 3 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 7c1375a..f3cc221 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -6,12 +6,15 @@ class AdminController < ApplicationController
 
   def index
     @drafts = Node.all(
-      :limit => 20,
+      :limit => 50,
       :order => "updated_at desc",
       :conditions => ["draft_id IS NOT NULL"]
     )
+    @drafts_count = Node.count(
+      :conditions => ["draft_id IS NOT NULL"]
+    )
     @recent_changes = Node.all(
-      :limit => 20,
+      :limit => 50,
       :order => "updated_at desc",
       :conditions => [ 
         "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL", Time.now, Time.now-14.days
@@ -24,6 +27,17 @@ class AdminController < ApplicationController
       @sitemap_depth[node.id] = level
     end
     @sitemap = all_nodes.to_a.sort! { |node1,node2| node1.lft <=> node2.lft }.delete_if { |node| node.update? }
+
+    @mypages = Page.all(
+      :conditions => [ "user_id = ? or editor_id = ?", @current_user, @current_user]
+    )
+
+    @mynodes = Node.all(
+      :order => "updated_at desc",
+      :joins => :pages,
+      :conditions => [ "pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user ]
+    ).uniq.first(50)
+
   end
   
   def search
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 4f72744..b8cd644 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -25,6 +25,10 @@ class NodesController < ApplicationController
 
   def new
     @node = Node.new params[:node]
+    if params.has_key?(:parent_id)
+      @parent_id = params[:parent_id]
+      @parent_name = Node.find(@parent_id).title
+    end
   end
   
   def create
@@ -33,9 +37,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])
+      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
@@ -107,6 +118,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]