Merged r20803 from trunk to 4.1-stable (#34595).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20804 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/project_jump_box.rb b/lib/redmine/project_jump_box.rb
index d3116a3ffa24bd4df474cd8bd3631200fbc1072b..b9f616f3457dde8a7a45c2091df85bf4ba080894 100644 (file)
--- a/lib/redmine/project_jump_box.rb
+++ b/lib/redmine/project_jump_box.rb
@@ -35,6 +35,7 @@ module Redmine
         projects = projects.like(query)
       end
       projects.
+        visible.
         index_by(&:id).
         values_at(*project_ids). # sort according to stored order
         compact

diff --git a/test/unit/lib/redmine/project_jump_box_test.rb b/test/unit/lib/redmine/project_jump_box_test.rb
index 38a0b78cc748f65630eb78002f6ec0851346dd64..0ff805c5f2326f611fcb91182b637fb50ea5d057 100644 (file)
--- a/test/unit/lib/redmine/project_jump_box_test.rb
+++ b/test/unit/lib/redmine/project_jump_box_test.rb
@@ -23,7 +23,8 @@ class Redmine::ProjectJumpBoxTest < ActiveSupport::TestCase
   fixtures :users, :projects, :user_preferences
 
   def setup
-    @user = User.find_by_login 'dlopper'
+    @user = User.find_by_login 'jsmith'
+    User.current = @user
     @ecookbook = Project.find 'ecookbook'
     @onlinestore = Project.find 'onlinestore'
   end
@@ -142,4 +143,16 @@ class Redmine::ProjectJumpBoxTest < ActiveSupport::TestCase
     assert_equal @onlinestore, pjb.recently_used_projects.first
     assert_equal @ecookbook, pjb.recently_used_projects.last
   end
+
+  def test_recents_list_should_include_only_visible_projects
+    @user = User.find_by_login 'dlopper'
+    User.current = @user
+
+    pjb = Redmine::ProjectJumpBox.new @user
+    pjb.project_used @ecookbook
+    pjb.project_used @onlinestore
+
+    assert_equal 1, pjb.recently_used_projects.size
+    assert_equal @ecookbook, pjb.recently_used_projects.first
+  end
 end