jro_apps/redmine Commit - r5020:5f889932b6ce

Changed the way the visibility SQL statement is built....

Jean-Philippe Lang -

r5020:5f889932b6ce

parent child

Context file:

r5020:5f889932b6ce

Collapse all files

app/models/project.rb +17 -11

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
               end
               def self.allowed_to_condition(user, permission, options={})
-                statements = []
                 base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 if perm = Redmine::AccessControl.permission(permission)
                   unless perm.project_module.nil?
                   project_statement << " OR (#{Project.table_name}.lft > #{options[:project].lft} AND #{Project.table_name}.rgt < #{options[:project].rgt})" if options[:with_subprojects]
                   base_statement = "(#{project_statement}) AND (#{base_statement})"
                 end
                 if user.admin?
-                  # no restriction
+                  base_statement
                 else
-                  statements << "1=0"
+                  statement_by_role = {}
                   if user.logged?
                     if Role.non_member.allowed_to?(permission) && !options[:member]
-                      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}"
+                      statement_by_role[Role.non_member] = "#{Project.table_name}.is_public = #{connection.quoted_true}"
+                    end
+                    user.projects_by_role.each do |role, projects|
+                      if role.allowed_to?(permission)
+                        statement_by_role[role] = "#{Project.table_name}.id IN (#{projects.collect(&:id).join(',')})"
+                      end
                     end
-                    allowed_project_ids = user.memberships.select {|m| m.roles.detect {|role| role.allowed_to?(permission)}}.collect {|m| m.project_id}
-                    statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
                   else
                     if Role.anonymous.allowed_to?(permission) && !options[:member]
-                      # anonymous user allowed on public project
+                      statement_by_role[Role.anonymous] = "#{Project.table_name}.is_public = #{connection.quoted_true}"
-                      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}"
                     end
                   end
+                  if statement_by_role.empty?
+                    "1=0"
+                  else
+                    "((#{base_statement}) AND (#{statement_by_role.values.join(' OR ')}))"
+                  end
                 end
-                statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
               end
               # Returns the Systemwide and project specific activities

app/models/user.rb +19 -1

             # Redmine - project management software
-            # Copyright (C) 2006-2009  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
               def reload(*args)
                 @name = nil
+                @projects_by_role = nil
                 super
               end
                 !roles_for_project(project).detect {|role| role.member?}.nil?
               end
+              # Returns a hash of user's projects grouped by roles
+              def projects_by_role
+                return @projects_by_role if @projects_by_role
+                @projects_by_role = Hash.new {|h,k| h[k]=[]}
+                memberships.each do |membership|
+                  membership.roles.each do |role|
+                    @projects_by_role[role] << membership.project if membership.project
+                  end
+                end
+                @projects_by_role.each do |role, projects|
+                  projects.uniq!
+                end
+                @projects_by_role
+              end
               # Return true if the user is allowed to do the specified action on a specific context
               # Action can be:
               # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')

test/unit/user_test.rb +17 0

@@ -522,6 +522,23 class UserTest < ActiveSupport::TestCase
522	assert_nil @dlopper.roles_for_project(Project.find(2)).detect {\|role\| role.member?}	522	assert_nil @dlopper.roles_for_project(Project.find(2)).detect {\|role\| role.member?}
523	end	523	end
524		524
		525	def test_projects_by_role_for_user_with_role
		526	user = User.find(2)
		527	assert_kind_of Hash, user.projects_by_role
		528	assert_equal 2, user.projects_by_role.size
		529	assert_equal [1,5], user.projects_by_role[Role.find(1)].collect(&:id).sort
		530	assert_equal [2], user.projects_by_role[Role.find(2)].collect(&:id).sort
		531	end
		532
		533	def test_projects_by_role_for_user_with_no_role
		534	user = User.generate!
		535	assert_equal({}, user.projects_by_role)
		536	end
		537
		538	def test_projects_by_role_for_anonymous
		539	assert_equal({}, User.anonymous.projects_by_role)
		540	end
		541
525	def test_valid_notification_options	542	def test_valid_notification_options
526	# without memberships	543	# without memberships
527	assert_equal 5, User.find(7).valid_notification_options.size	544	assert_equal 5, User.find(7).valid_notification_options.size

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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