replaced freeform textfield with select tag which has to be replaced with something more decent soon. but it works for now

2 files changed, 14 insertions, 9 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 829e26f..a558a86 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -24,15 +24,15 @@ class NodesController < ApplicationController
   end
 
   def create
-    parent = Node.find_by_unique_name(params[:parent_unique_name])
-    parent ||= Node.root
-    
     @node = Node.new( params[:node] )
     
-    if request.post? and @node.save
+    parent = Node.find(params[:parent_id])
+    
+    if parent and @node.save
       @node.move_to_child_of parent
       redirect_to(@node)
     else
+      @node.errors.add("Parent node")
       render :action => :new
     end
   end
@@ -46,9 +46,9 @@ class NodesController < ApplicationController
   end
 
   def update
-    draft = @node.find_or_create_draft current_user
-    
-    if draft.update_attributes( params[:page] )
+    @draft = @node.find_or_create_draft current_user
+    @draft.tag_list = params[:tag_list]
+    if @draft.update_attributes( params[:page] )
       redirect_to(@node)
     else
       render :action => :edit
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb
index d657eb3..29a26b6 100644
--- a/app/views/nodes/new.html.erb
+++ b/app/views/nodes/new.html.erb
@@ -4,8 +4,13 @@
 
 <% form_for @node do |f| %>
   <p>
-    <%= f.label 'Parent node - Leave empty for top level' %><br />
-    <%= text_field_tag :parent_unique_name %>
+    <%= f.label 'Parent node' %><br />
+    <%= select_tag( 
+          :parent_id, 
+          options_for_select(
+            Node.root.self_and_descendants.select{|x| x.level < 3}.map{|x| [x.unique_name,x.id]}
+          )
+        ) %>
   </p>
   <p>
     <%= f.label :slug %><br />