4 files changed, 19 insertions, 8 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d9cf1be6..2b35fd20 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -5,7 +5,9 @@ class AdminController < ApplicationController
   before_action :login_required
 
   def index
-    @drafts = Node.drafts_and_autosaves(current_user_id: current_user.id).limit(5)
+    scope         = Node.work_in_progress(current_user_id: current_user.id)
+    @drafts_total = scope.reorder(nil).count
+    @drafts       = scope.includes(:head, :draft, :lock_owner).limit(5)
     @actions = NodeAction.order(:occurred_at => :desc, :id => :desc).limit(5)
   end
 
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 50b30881..2a2cde33 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -231,7 +231,7 @@ class NodesController < ApplicationController
 
   # Filter functions for admin views
   def drafts
-    @nodes = index_matching(Node.drafts_and_autosaves)
+    @nodes = index_matching(Node.work_in_progress)
   end
 
   def mine
diff --git a/app/models/node.rb b/app/models/node.rb
index 02502f6c..1e61f9fe 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -593,12 +593,15 @@ class Node < ApplicationRecord
       .distinct
   end
 
-  def self.drafts_and_autosaves(current_user_id: nil)
-    scope = where("draft_id IS NOT NULL OR autosave_id IS NOT NULL").not_in_trash
-    return scope.order("updated_at DESC") unless current_user_id
+  # Nodes carrying unfinished work: a draft, an autosave, or a lock with
+  # neither behind it
+  def self.work_in_progress(current_user_id: nil)
+    scope = where("draft_id IS NOT NULL OR autosave_id IS NOT NULL OR locking_user_id IS NOT NULL")
+              .not_in_trash
+    return scope.order("nodes.updated_at ASC") unless current_user_id
 
     scope.order(
-      Arel.sql(sanitize_sql_array(["CASE WHEN locking_user_id = ? THEN 0 ELSE 1 END, updated_at DESC", current_user_id]))
+      Arel.sql(sanitize_sql_array(["CASE WHEN locking_user_id = ? THEN 0 ELSE 1 END, nodes.updated_at ASC", current_user_id]))
     )
   end
 
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index 25bdbdc6..984858e5 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -23,7 +23,7 @@
 
 <div id="dashboard_widgets">
   <div class="dashboard_widget">
-    <h3><%= t(".drafts_widget") %></h3>
+    <h3><%= t(".drafts_widget", :total => @drafts_total) %></h3>
     <ul>
       <% @drafts.each do |node| %>
         <li>
@@ -32,7 +32,13 @@
             <span class="field_hint"><%= link_to_path("#{node.unique_name} ↗", node.unique_name) %></span>
           </div>
           <span class="dashboard_widget_meta">
-            <% if (editor = node_last_editor(node)) %><%= editor %>, <% end %><%= relative_time_phrase(node.updated_at) %>
+            <% if node.locked? %>
+              <%= icon("lock", library: "tabler", "aria-label": t(".held_by")) %>
+              <%= node.lock_owner.login %>,
+            <% elsif (editor = node_last_editor(node)) %>
+              <%= editor %>,
+            <% end %>
+            <%= relative_time_phrase(node.updated_at) %>
           </span>
         </li>
       <% end %>