4 files changed, 10 insertions, 10 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 04d98b5..8b7fe62 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -8,7 +8,7 @@ class Node < ActiveRecord::Base
   belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id
   has_many    :permissions
   has_one     :event
-  belongs_to  :user,                          :foreign_key => :locking_user_id
+  belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id
   
   # Callbacks
   after_create  :initialize_empty_page
@@ -46,12 +46,12 @@ class Node < ActiveRecord::Base
   # Instance Methods
   
   def find_or_create_draft current_user
-    if draft && self.user == current_user
+    if draft && self.lock_owner == current_user
       draft
-    elsif draft && self.user.nil?
+    elsif draft && self.lock_owner.nil?
       lock_for! current_user
       draft
-    elsif draft && self.user != current_user
+    elsif draft && self.lock_owner != current_user
       raise "Page is locked"
     else
       lock_for! current_user
@@ -98,13 +98,13 @@ class Node < ActiveRecord::Base
   end
   
   def unlock!
-    self.user = nil
+    self.lock_owner = nil
     self.save
   end
   
   protected
     def lock_for! current_user
-      self.user = current_user
+      self.lock_owner = current_user
       self.save
     end
   
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index c5bb5de..b40f92a 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -12,7 +12,7 @@
       <td><%= draft.id %></td>
       <td><%= draft.title %></td>
       <td><%= draft.node.unique_name %></td>
-      <td><%= draft.user.login rescue "" %></td>
+      <td><%= draft.node.lock_owner.login rescue "" %></td>
       <td><%= link_to 'Show', node_path(draft.node) %></td>
       <td><%= link_to "Diff revisions", :controller => :revisions, :action => :diff, :id => draft.node.id %></td>
       <td><%= link_to "Publish", publish_node_path(draft.node), :method => :put, :confirm => "Do you really want to publish?" %></td>
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 53ddb5b..be63de3 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -28,7 +28,7 @@
           <%= link_to 'Unlock', unlock_node_path(node), :method => :put, :confirm => "Are you sure you want to unlock?" %>
       </td>
       <td>
-        <%= node.user.login if node.user %>
+        <%= node.lock_owner.login if node.lock_owner %>
       </td>
       <td>
         <%= node.draft ? node.draft.revision : node.head.revision %>
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index a7405f0..817c6f9 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -30,7 +30,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_not_nil @first_child.draft
     assert_nil @first_child.draft.user
     @first_child.find_or_create_draft @user1
-    assert_equal @user1, @first_child.user
+    assert_equal @user1, @first_child.lock_owner
   end
   
   def test_unique_path_returns_an_array
@@ -122,7 +122,7 @@ class NodeTest < ActiveSupport::TestCase
     node.move_to_child_of @root
     node.publish_draft!
     node.find_or_create_draft @user1
-    assert_equal @user1, node.user
+    assert_equal @user1, node.lock_owner
     assert_raise(RuntimeError) do
       node.find_or_create_draft @user2
     end