renamed the user association on nodes to lock_owner as it is more specific for its purpose

2 files changed, 2 insertions, 2 deletions

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 %>