jro_apps/redmine Commit - r15178:1f79610fdc05

Merged r15536 and r15541 (#23083)....

Jean-Philippe Lang -

r15178:1f79610fdc05

parent child

Context file:

r15178:1f79610fdc05

lib/redmine/field_format.rb +10 -3

                       projects.map {|project| possible_values_options(custom_field, project)}.reduce(:&) || []
                     elsif object.respond_to?(:project) && object.project
                       scope = object.project.shared_versions
+                      filtered_versions_options(custom_field, scope, all_statuses)
+                    elsif object.nil?
+                      scope = Version.visible.where(:sharing => 'system')
+                      filtered_versions_options(custom_field, scope, all_statuses)
+                    else
+                      []
+                    end
+                  end
+                  def filtered_versions_options(custom_field, scope, all_statuses=false)
                     if !all_statuses && custom_field.version_status.is_a?(Array)
                       statuses = custom_field.version_status.map(&:to_s).reject(&:blank?)
                       if statuses.any?
                       end
                     end
                     scope.sort.collect{|u| [u.to_s, u.id.to_s] }
-                    else
-                      []
-                    end
                   end
                 end
               end

test/unit/custom_field_version_format_test.rb +1 0

               end
               def test_possible_values_options_with_no_arguments
+                Version.delete_all
                 assert_equal [], @field.possible_values_options
                 assert_equal [], @field.possible_values_options(nil)
               end

test/unit/lib/redmine/field_format/version_field_format_test.rb +9 0

@@ -52,6 +52,15 class Redmine::VersionFieldFormatTest < ActionView::TestCase
52	assert_equal expected, field.possible_values_options(project).map(&:first)	52	assert_equal expected, field.possible_values_options(project).map(&:first)
53	end	53	end
54		54
		55	def test_possible_values_options_should_return_system_shared_versions_without_project
		56	field = IssueCustomField.new(:field_format => 'version')
		57	version = Version.generate!(:project => Project.find(1), :status => 'open', :sharing => 'system')
		58
		59	expected = Version.visible.where(:sharing => 'system').sort.map(&:name)
		60	assert_include version.name, expected
		61	assert_equal expected, field.possible_values_options.map(&:first)
		62	end
		63
55	def test_possible_values_options_should_return_project_versions_with_selected_status	64	def test_possible_values_options_should_return_project_versions_with_selected_status
56	field = IssueCustomField.new(:field_format => 'version', :version_status => ["open"])	65	field = IssueCustomField.new(:field_format => 'version', :version_status => ["open"])
57	project = Project.find(1)	66	project = Project.find(1)

General Comments 0

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

No TODOs yet

	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