implemented that pages now have an author and an editor

2 files changed, 6 insertions, 3 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 44e6c47..9bfea52 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -63,7 +63,8 @@ class Node < ActiveRecord::Base
       draft
     elsif draft && self.lock_owner.nil?
       lock_for! current_user
-      draft.user = current_user if draft.user.nil?
+      draft.user    = current_user if draft.user.nil?
+      draft.editor  = current_user
       draft.save
       draft
     elsif draft && self.lock_owner != current_user
@@ -79,8 +80,9 @@ class Node < ActiveRecord::Base
   end
   
   def create_new_draft user
-    empty_page = self.pages.create!
-    empty_page.user = (self.head ? self.head.user : user)
+    empty_page        = self.pages.create!
+    empty_page.user   = (self.head ? self.head.user : user)
+    empty_page.editor = user
     empty_page.save
     
     empty_page.clone_attributes_from self.head
diff --git a/app/models/page.rb b/app/models/page.rb
index ee30480..b17c32b 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -30,6 +30,7 @@ class Page < ActiveRecord::Base
   # Associations
   belongs_to :node
   belongs_to :user
+  belongs_to :editor, :class_name => "User"
   has_many   :related_assets
   has_many   :assets, :through => :related_assets, :order => "position ASC"