3 files changed, 42 insertions, 17 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 390136e..583ddf9 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -2,6 +2,8 @@ class NodesController < ApplicationController
   
   layout 'admin'
   
+  before_filter :find_node, :only => [:create, :show, :edit, :update, :destroy]
+  
   def index
     @nodes = Node.root.children.all(:include => :head)
   end
@@ -10,6 +12,14 @@ class NodesController < ApplicationController
   end
 
   def create
+    tmp_node = Node.new( params[:node] )
+    
+    if request.post? and tmp_node.save
+      tmp_node.move_to_child_of @node
+      redirect_to(tmp_node)
+    else
+      render :action => :new
+    end
   end
 
   def show
@@ -17,14 +27,22 @@ class NodesController < ApplicationController
   end
 
   def edit
-    node = Node.find(params[:id])
-    @page = node.find_or_create_draft current_user
+    
   end
 
   def update
+    draft = @node.find_or_create_draft current_user
+    draft.update_attributes params[:page]
+    draft.save
   end
 
   def destroy
   end
+  
+  private
+  
+    def find_node
+      @node = Node.find(params[:id])
+    end
 
 end
diff --git a/app/models/node.rb b/app/models/node.rb
index bc48ac4..05da907 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -47,6 +47,11 @@ class Node < ActiveRecord::Base
   def find_or_create_draft user
     if draft && draft.user == user
       draft
+    elsif draft && draft.user.nil?
+      tmp_draft = draft
+      tmp_draft.user = user
+      tmp_draft.save
+      tmp_draft
     elsif draft && draft.user != user
       raise "Page is locked"
     else
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index a5668e2..433c5eb 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -2,29 +2,31 @@
 
 <h1>Editing page</h1>
 
-<% form_for(@page) do |f| %>
+<% form_for(@node) do |f| %>
   <%= f.error_messages %>
 
+  <% if draft = @node.find_or_create_draft( User.first ) %>
+  
+  <% fields_for @node.draft do |d| %>
   <p>
-    <%= f.label :node_id %><br />
-    <%= f.text_field :node_id %>
+    <%= d.label :title %><br />
+    <%= d.text_field :title %>
   </p>
   <p>
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
+    <%= d.label :abstract %><br />
+    <%= d.text_area :abstract %>
   </p>
   <p>
-    <%= f.label :abstract %><br />
-    <%= f.text_area :abstract %>
-  </p>
-  <p>
-    <%= f.label :body %><br />
-    <%= f.text_area :body %>
-  </p>
-  <p>
-    <%= f.label :revision %><br />
-    <%= f.text_field :revision %>
+    <%= d.label :body %><br />
+    <%= d.text_area :body %>
   </p>
+  <% end %>
+  
+  <% else %>
+  
+  <p>Page is locked</p>
+  
+  <% end %>
   <p>
     <%= f.submit "Update" %>
   </p>