jro_apps/redmine Commit - r8745:cccfed7006f1

Fixed: error when creating a project with a version format custom field (#10218)....

Jean-Philippe Lang -

r8745:cccfed7006f1

parent child

Context file:

r8745:cccfed7006f1

Collapse all files

app/models/project.rb +9 -4

                # Returns a scope of the Versions used by the project
                def shared_versions
-                 @shared_versions ||= begin
-                   r = root? ? self : root
+                 if new_record?
                    Version.scoped(:include => :project,
-                                  :conditions => "#{Project.table_name}.id = #{id}" +
-                                                 " OR (#{Project.table_name}.status = #{Project::STATUS_ACTIVE} AND (" +
+                                  :conditions => "#{Project.table_name}.status = #{Project::STATUS_ACTIVE} AND #{Version.table_name}.sharing = 'system'")
+                 else
+                   @shared_versions ||= begin
+                     r = root? ? self : root
+                     Version.scoped(:include => :project,
+                                    :conditions => "#{Project.table_name}.id = #{id}" +
+                                                   " OR (#{Project.table_name}.status = #{Project::STATUS_ACTIVE} AND (" +
                                                        " #{Version.table_name}.sharing = 'system'" +
                                                        " OR (#{Project.table_name}.lft >= #{r.lft} AND #{Project.table_name}.rgt <= #{r.rgt} AND #{Version.table_name}.sharing = 'tree')" +
                                                        " 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
                  end
                end

test/unit/project_test.rb +7 0

                  assert !versions.collect(&:id).include?(6)
                end
+               def test_shared_versions_for_new_project_should_include_system_shared_versions
+                 p = Project.find(5)
+                 v = Version.create!(:name => 'system_sharing', :project => p, :sharing => 'system')
+                 assert_include v, Project.new.shared_versions
+               end
                def test_next_identifier
                  ProjectCustomField.delete_all
                  Project.create!(:name => 'last', :identifier => 'p2008040')

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