2 files changed, 23 insertions, 5 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 6ab2135..435df57 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -20,12 +20,10 @@ class AdminController < ApplicationController
     ordered_with_level.each { |node, level| @sitemap_depth[node.id] = level }
     @sitemap = ordered_with_level.map(&:first).reject(&:update?)
 
-    @mypages = Page.where("user_id = ? or editor_id = ?", @current_user, @current_user)
-
     @mynodes = Node.joins(:pages)
-              .where("pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user)
-              .order("updated_at desc")
-              .uniq.first(50)
+          .where("pages.user_id = ? or pages.editor_id = ?", current_user, current_user)
+          .order("updated_at desc")
+          .distinct.first(50)
   end
 
   def conventions
diff --git a/test/controllers/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
index d6005ba..13cc1bb 100644
--- a/test/controllers/admin_controller_test.rb
+++ b/test/controllers/admin_controller_test.rb
@@ -14,4 +14,24 @@ class AdminControllerTest < ActionController::TestCase
     get :index
     assert_includes assigns(:drafts), node
   end
+
+  test "my work list shows each matching node only once, even with several revisions by the same user" do
+    login_as :quentin
+    user = User.find_by_login("quentin")
+    node = Node.root.children.create!(:slug => "dedup_test")
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v2"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    # three pages now exist on this node, all touched by quentin --
+    # without DISTINCT, the join would return this node three times
+
+    get :index
+    matches = assigns(:mynodes).select { |n| n.id == node.id }
+    assert_equal 1, matches.length
+  end
 end