Makes Project.allowed_to_condition actually works with nested sets.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/work@2153 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
76462d76b5
commit
7353a628bf
1 file changed
+1
-1
@@ -119,7 +119,7 @@ class Project < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
if options[:project]
|
if options[:project]
|
||||||
project_statement = "#{Project.table_name}.id = #{options[:project].id}"
|
project_statement = "#{Project.table_name}.id = #{options[:project].id}"
|
||||||
project_statement << " OR #{Project.table_name}.parent_id = #{options[:project].id}" if options[:with_subprojects]
|
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})"
|
base_statement = "(#{project_statement}) AND (#{base_statement})"
|
||||||
end
|
end
|
||||||
if user.admin?
|
if user.admin?
|
||||||
|
|||||||
Reference in new issue
Block a user