jro_apps/redmine Commit - r15433:dcf2e15b0617

Bulk edit form not show fields based on target tracker and status (#23755)....

Jean-Philippe Lang -

r15433:dcf2e15b0617

parent child

Context file:

r15433:dcf2e15b0617

Collapse all files

app/controllers/issues_controller.rb +21 -4

                   end
                 end
+                edited_issues = Issue.where(:id => @issues.map(&:id)).to_a
                 @allowed_projects = Issue.allowed_target_projects
                 if params[:issue]
                   @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
                   if @target_project
                     target_projects = [@target_project]
+                    edited_issues.each {|issue| issue.project = @target_project}
                   end
                 end
                 target_projects ||= @projects
+                @trackers = target_projects.map {|p| Issue.allowed_target_trackers(p) }.reduce(:&)
+                if params[:issue]
+                  @target_tracker = @trackers.detect {|t| t.id.to_s == params[:issue][:tracker_id].to_s}
+                  if @target_tracker
+                    edited_issues.each {|issue| issue.tracker = @target_tracker}
+                  end
+                end
                 if @copy
                   # Copied issues will get their default statuses
                   @available_statuses = []
                 else
-                  @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
+                  @available_statuses = edited_issues.map(&:new_statuses_allowed_to).reduce(:&)
                 end
-                @custom_fields = @issues.map{|i|i.editable_custom_fields}.reduce(:&)
+                if params[:issue]
+                  @target_status = @available_statuses.detect {|t| t.id.to_s == params[:issue][:status_id].to_s}
+                  if @target_status
+                    edited_issues.each {|issue| issue.status = @target_status}
+                  end
+                end
+                @custom_fields = edited_issues.map{|i|i.editable_custom_fields}.reduce(:&)
                 @assignables = target_projects.map(&:assignable_users).reduce(:&)
-                @trackers = target_projects.map {|p| Issue.allowed_target_trackers(p) }.reduce(:&)
                 @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
                 @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
                 if @copy
                   @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
                 end
-                @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
+                @safe_attributes = edited_issues.map(&:safe_attribute_names).reduce(:&)
                 @issue_params = params[:issue] || {}
                 @issue_params[:custom_field_values] ||= {}

app/views/issues/bulk_edit.html.erb +4 -2

               <label for="issue_tracker_id"><%= l(:field_tracker) %></label>
               <%= select_tag('issue[tracker_id]',
                              content_tag('option', l(:label_no_change_option), :value => '') +
-                               options_from_collection_for_select(@trackers, :id, :name, @issue_params[:tracker_id])) %>
+                               options_from_collection_for_select(@trackers, :id, :name, @issue_params[:tracker_id]),
+                               :onchange => "updateBulkEditFrom('#{escape_javascript url_for(:action => 'bulk_edit', :format => 'js')}')") %>
             </p>
             <% if @available_statuses.any? %>
             <p>
               <label for='issue_status_id'><%= l(:field_status) %></label>
               <%= select_tag('issue[status_id]',
                              content_tag('option', l(:label_no_change_option), :value => '') +
-                               options_from_collection_for_select(@available_statuses, :id, :name, @issue_params[:status_id])) %>
+                               options_from_collection_for_select(@available_statuses, :id, :name, @issue_params[:status_id]),
+                               :onchange => "updateBulkEditFrom('#{escape_javascript url_for(:action => 'bulk_edit', :format => 'js')}')") %>
             </p>
             <% end %>

test/functional/issues_controller_test.rb +14 0

@@ -3996,6 +3996,20 class IssuesControllerTest < Redmine::ControllerTest
3996	assert_select 'input[name=?]', "issue[custom_field_values][#{field2.id}]", 0	3996	assert_select 'input[name=?]', "issue[custom_field_values][#{field2.id}]", 0
3997	end	3997	end
3998		3998
		3999	def test_bulk_edit_should_propose_target_tracker_custom_fields
		4000	IssueCustomField.delete_all
		4001	field1 = IssueCustomField.generate!(:tracker_ids => [1], :is_for_all => true)
		4002	field2 = IssueCustomField.generate!(:tracker_ids => [2], :is_for_all => true)
		4003	@request.session[:user_id] = 2
		4004
		4005	issue_ids = Issue.where(:project_id => 1, :tracker_id => 1).limit(2).ids
		4006	get :bulk_edit, :ids => issue_ids, :issue => {:tracker_id => 2}
		4007	assert_response :success
		4008
		4009	assert_select 'input[name=?]', "issue[custom_field_values][#{field1.id}]", 0
		4010	assert_select 'input[name=?]', "issue[custom_field_values][#{field2.id}]"
		4011	end
		4012
3999	def test_bulk_update	4013	def test_bulk_update
4000	@request.session[:user_id] = 2	4014	@request.session[:user_id] = 2
4001	# update issues priority	4015	# update issues priority

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