jro_apps/redmine Commit - r5234:d0ea5fae62b1

Fixed: empty list for user/version custom fields on bulk edit form (#2096)....

Jean-Philippe Lang -

r5234:d0ea5fae62b1

parent child

Context file:

r5234:d0ea5fae62b1

Collapse all files

app/helpers/custom_fields_helper.rb +2 -2

                 custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
               end
-              def custom_field_tag_for_bulk_edit(name, custom_field)
+              def custom_field_tag_for_bulk_edit(name, custom_field, projects)
                 field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                 field_id = "#{name}_custom_field_values_#{custom_field.id}"
                 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                                                                [l(:general_text_yes), '1'],
                                                                [l(:general_text_no), '0']]), :id => field_id)
                   when "list"
-                    select_tag(field_name, options_for_select([[l(:label_no_change_option), '']] + custom_field.possible_values_options), :id => field_id)
+                    select_tag(field_name, options_for_select([[l(:label_no_change_option), '']] + custom_field.possible_values_options(projects)), :id => field_id)
                   else
                     text_field_tag(field_name, '', :id => field_id)
                 end

app/models/custom_field.rb +2 0

                     when 'version'
                       obj.project.versions.sort.collect {|u| [u.to_s, u.id.to_s]}
                     end
+                  elsif obj.is_a?(Array)
+                    obj.collect {|o| possible_values_options(o)}.inject {|memo, v| memo & v}
                   else
                     []
                   end

app/views/issues/bulk_edit.rhtml +1 -1

             <% end %>
             <% @custom_fields.each do |custom_field| %>
-            	<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field) %></p>
+            	<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects) %></p>
             <% end %>
             <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>

app/views/timelog/bulk_edit.rhtml +1 -1

                 </p>
                 <% @custom_fields.each do |custom_field| %>
-                  <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('time_entry', custom_field) %></p>
+                  <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('time_entry', custom_field, @projects) %></p>
                 <% end %>
                 <%= call_hook(:view_time_entries_bulk_edit_details_bottom, { :time_entries => @time_entries }) %>

test/functional/issues_controller_test.rb +33 -1

@@ -1,5 +1,5
1	# Redmine - project management software	1	# Redmine - project management software
2	# Copyright (C) 2006-2008 Jean-Philippe Lang	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
@@ -1123,6 +1123,38 class IssuesControllerTest < ActionController::TestCase
1123	assert !field.project_ids.include?(Issue.find(6).project_id)	1123	assert !field.project_ids.include?(Issue.find(6).project_id)
1124	assert_no_tag :input, :attributes => {:name => 'issue[custom_field_values][9]'}	1124	assert_no_tag :input, :attributes => {:name => 'issue[custom_field_values][9]'}
1125	end	1125	end
		1126
		1127	def test_get_bulk_edit_with_user_custom_field
		1128	field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true)
		1129
		1130	@request.session[:user_id] = 2
		1131	get :bulk_edit, :ids => [1, 2]
		1132	assert_response :success
		1133	assert_template 'bulk_edit'
		1134
		1135	assert_tag :select,
		1136	:attributes => {:name => "issue[custom_field_values][#{field.id}]"},
		1137	:children => {
		1138	:only => {:tag => 'option'},
		1139	:count => Project.find(1).users.count + 1
		1140	}
		1141	end
		1142
		1143	def test_get_bulk_edit_with_version_custom_field
		1144	field = IssueCustomField.create!(:name => 'Affected version', :field_format => 'version', :is_for_all => true)
		1145
		1146	@request.session[:user_id] = 2
		1147	get :bulk_edit, :ids => [1, 2]
		1148	assert_response :success
		1149	assert_template 'bulk_edit'
		1150
		1151	assert_tag :select,
		1152	:attributes => {:name => "issue[custom_field_values][#{field.id}]"},
		1153	:children => {
		1154	:only => {:tag => 'option'},
		1155	:count => Project.find(1).versions.count + 1
		1156	}
		1157	end
1126		1158
1127	def test_bulk_update	1159	def test_bulk_update
1128	@request.session[:user_id] = 2	1160	@request.session[:user_id] = 2

test/unit/custom_field_user_format_test.rb +7 0

                 assert_equal project.users.sort.map {|u| [u.name, u.id.to_s]}, possible_values_options
               end
+              def test_possible_values_options_with_array
+                projects = Project.find([1, 2])
+                possible_values_options = @field.possible_values_options(projects)
+                assert possible_values_options.any?
+                assert_equal (projects.first.users & projects.last.users).sort.map {|u| [u.name, u.id.to_s]}, possible_values_options
+              end
               def test_cast_blank_value
                 assert_equal nil, @field.cast_value(nil)
                 assert_equal nil, @field.cast_value("")

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