diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-07 19:28:47 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-07 19:28:47 +0000 |
| commit | 5266e328c029405ab132f4fb99a5ba9bc1d6ba67 (patch) | |
| tree | 77f877be19838d2da4196e3431e6c288beb608b8 /app/models/project.rb | |
| parent | 84bf891bb5bc71edfed3f5da75f4af98ddfc1a41 (diff) | |
| download | redmine-5266e328c029405ab132f4fb99a5ba9bc1d6ba67.tar.gz redmine-5266e328c029405ab132f4fb99a5ba9bc1d6ba67.zip | |
Fixes Project#shared_versions for descendants sharing (#465).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3130 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 77de59f44..593e60c9e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -340,8 +340,8 @@ class Project < ActiveRecord::Base " OR (#{Project.table_name}.status = #{Project::STATUS_ACTIVE} AND (" + " #{Version.table_name}.sharing = 'system'" + " OR (#{Project.table_name}.lft >= #{root.lft} AND #{Project.table_name}.rgt <= #{root.rgt} AND #{Version.table_name}.sharing = 'tree')" + - " OR (#{Project.table_name}.lft < #{lft} AND #{Project.table_name}.rgt > #{rgt} AND #{Version.table_name}.sharing = 'hierarchy')" + - " OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt} AND #{Version.table_name}.sharing IN ('hierarchy', 'descendants'))" + + " OR (#{Project.table_name}.lft < #{lft} AND #{Project.table_name}.rgt > #{rgt} AND #{Version.table_name}.sharing IN ('hierarchy', 'descendants'))" + + " OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt} AND #{Version.table_name}.sharing = 'hierarchy')" + "))") end |