meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 01:11:12 +00:00
Code Issues Releases Wiki Activity

Code cleanup: use #project_condition.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13497 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-10-23 17:23:02 +00:00
parent 41d81a09b3
commit ca5946d82e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/project.rb
View File

@ -179,9 +179,8 @@ class Project < ActiveRecord::Base
# If the permission belongs to a project module, make sure the module is enabled
base_statement << " AND #{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name='#{perm.project_module}')"
end
if options[:project]
project_statement = "#{Project.table_name}.id = #{options[:project].id}"
project_statement << " OR (#{Project.table_name}.lft > #{options[:project].lft} AND #{Project.table_name}.rgt < #{options[:project].rgt})" if options[:with_subprojects]
if project = options[:project]
project_statement = project.project_condition(options[:with_subprojects])
base_statement = "(#{project_statement}) AND (#{base_statement})"
end