allow to overwrite the original user in edit view

4 files changed, 14 insertions, 2 deletions

diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index 79e75dc..d889719 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -21,6 +21,9 @@ module NodesHelper
     Page.custom_templates.map {|x| [x.gsub("_", " ").titlecase, x]}
   end
   
+  def user_list
+    User.all.map {|u| [u.login, u.id]}
+  end
   
   def event_information
     if @node.event
diff --git a/app/models/node.rb b/app/models/node.rb
index db484f9..7a79594 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -80,7 +80,7 @@ class Node < ActiveRecord::Base
   
   def create_new_draft user
     empty_page = self.pages.create!
-    empty_page.user = user
+    empty_page.user = user unless (self.head && self.head.user)
     empty_page.save
     
     empty_page.clone_attributes_from self.head
@@ -159,6 +159,10 @@ class Node < ActiveRecord::Base
     !children.empty? && !children.first.path_to_root.include?(self.slug)
   end
   
+  def head?
+    head_id
+  end
+  
   protected
     def lock_for! current_user
       self.lock_owner = current_user
diff --git a/app/models/page.rb b/app/models/page.rb
index 29fcae6..8eeab53 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -38,7 +38,7 @@ class Page < ActiveRecord::Base
   before_save   :rewrite_links_in_body
   
   # Security
-  attr_accessible :title, :abstract, :body, :template_name, :published_at
+  attr_accessible :title, :abstract, :body, :template_name, :published_at, :user_id
   
   # Class Methods
   
@@ -126,6 +126,7 @@ class Page < ActiveRecord::Base
     self.tag_list = page.tag_list
     self.template_name = page.template_name
     self.published_at = page.published_at
+    self.user = page.user
     
     # Getting rid of the auto-generated empty translations
     self.globalize_translations.delete_all
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 0063dd9..8e27d0f 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -55,6 +55,10 @@
         <td><%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %></td>
       </tr>
       <tr>
+        <td class="description">Author</td>
+        <td><%= d.select :user_id, user_list %></td>
+      </tr>
+      <tr>
         <td class="description">Images</td>
         <td> 
           <ul id="image_box" rel="<%= @draft.id %>">