jro_apps/redmine Commit - r10059:d33fa1f8c87f

Do not build a projects_by_role Hash that gets updated when accessing a key that is not present (#11662)....

Jean-Philippe Lang -

r10059:d33fa1f8c87f

parent child

Context file:

r10059:d33fa1f8c87f

app/models/user.rb +5 -2

               def projects_by_role
                 return @projects_by_role if @projects_by_role
-                @projects_by_role = Hash.new {|h,k| h[k]=[]}
+                @projects_by_role = Hash.new([])
                 memberships.each do |membership|
+                  if membership.project
                     membership.roles.each do |role|
-                    @projects_by_role[role] << membership.project if membership.project
+                      @projects_by_role[role] = [] unless @projects_by_role.key?(role)
+                      @projects_by_role[role] << membership.project
+                    end
                   end
                 end
                 @projects_by_role.each do |role, projects|

test/unit/user_test.rb +7 0

                 assert_equal [2], user.projects_by_role[Role.find(2)].collect(&:id).sort
               end
+              def test_accessing_projects_by_role_with_no_projects_should_return_an_empty_array
+                user = User.find(2)
+                assert_equal [], user.projects_by_role[Role.find(3)]
+                # should not update the hash
+                assert_nil user.projects_by_role.values.detect(&:blank?)
+              end
               def test_projects_by_role_for_user_with_no_role
                 user = User.generate!
                 assert_equal({}, user.projects_by_role)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages