From 20056a0e9b4f96680ca0c643166885f65dcd0be7 Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Tue, 20 Oct 2009 23:30:39 +0200
Subject: allow to overwrite the original user in edit view

---
 app/models/node.rb | 6 +++++-
 app/models/page.rb | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/models')

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
-- 
cgit v1.3