jro_apps/redmine Commit - r15842:6fabc106964a

Add warning when loosing data from custom fields when bulk editing issues (#22600)....

Jean-Philippe Lang -

r15842:6fabc106964a

parent child

Context file:

r15842:6fabc106964a

Collapse all files

app/controllers/issues_controller.rb +19 0

@@ -213,6 +213,16 class IssuesController < ApplicationController
213		213
214	edited_issues = Issue.where(:id => @issues.map(&:id)).to_a	214	edited_issues = Issue.where(:id => @issues.map(&:id)).to_a
215		215
		216	@values_by_custom_field = {}
		217	edited_issues.each do \|issue\|
		218	issue.custom_field_values.each do \|c\|
		219	if c.value_present?
		220	@values_by_custom_field[c.custom_field] \|\|= []
		221	@values_by_custom_field[c.custom_field] << issue.id
		222	end
		223	end
		224	end
		225
216	@allowed_projects = Issue.allowed_target_projects	226	@allowed_projects = Issue.allowed_target_projects
217	if params[:issue]	227	if params[:issue]
218	@target_project = @allowed_projects.detect {\|p\| p.id.to_s == params[:issue][:project_id].to_s}	228	@target_project = @allowed_projects.detect {\|p\| p.id.to_s == params[:issue][:project_id].to_s}
@@ -244,6 +254,15 class IssuesController < ApplicationController
244	end	254	end
245	end	255	end
246		256
		257	edited_issues.each do \|issue\|
		258	issue.custom_field_values.each do \|c\|
		259	if c.value_present? && @values_by_custom_field[c.custom_field]
		260	@values_by_custom_field[c.custom_field].delete(issue.id)
		261	end
		262	end
		263	end
		264	@values_by_custom_field.delete_if {\|k,v\| v.blank?}
		265
247	@custom_fields = edited_issues.map{\|i\|i.editable_custom_fields}.reduce(:&).select {\|field\| field.format.bulk_edit_supported}	266	@custom_fields = edited_issues.map{\|i\|i.editable_custom_fields}.reduce(:&).select {\|field\| field.format.bulk_edit_supported}
248	@assignables = target_projects.map(&:assignable_users).reduce(:&)	267	@assignables = target_projects.map(&:assignable_users).reduce(:&)
249	@versions = target_projects.map {\|p\| p.shared_versions.open}.reduce(:&)	268	@versions = target_projects.map {\|p\| p.shared_versions.open}.reduce(:&)

app/models/custom_field_value.rb +8 0

                 @value = custom_field.set_custom_field_value(self, v)
               end
+              def value_present?
+                if value.is_a?(Array)
+                  value.any?(&:present?)
+                else
+                  value.present?
+                end
+              end
               def validate_value
                 custom_field.validate_custom_value(self).each do |message|
                   customized.errors.add(:base, custom_field.name + ' ' + message)

app/views/issues/bulk_edit.html.erb +7 0

             </fieldset>
             </div>
+            <% if @values_by_custom_field.present? %>
+            <div class="flash warning">
+              <%= l(:warning_fields_cleared_on_bulk_edit) %>:<br />
+              <%= safe_join(@values_by_custom_field.map {|field, ids| content_tag "span", "#{field.name} (#{ids.size})"}, ', ') %>
+            </div>
+            <% end %>
             <p>
               <% if @copy %>
                 <%= hidden_field_tag 'copy', '1' %>

config/locales/en.yml +1 0

               error_no_projects_with_tracker_allowed_for_new_issue: "There are no projects with trackers for which you can create an issue"
               error_move_of_child_not_possible: "Subtask %{child} could not be moved to the new project: %{errors}"
               error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted: "Spent time cannot be reassigned to an issue that is about to be deleted"
+              warning_fields_cleared_on_bulk_edit: "Changes will result in the automatic deletion of values from one or more fields on the selected objects"
               mail_subject_lost_password: "Your %{value} password"
               mail_body_lost_password: 'To change your password, click on the following link:'

config/locales/fr.yml +1 0

               error_no_projects_with_tracker_allowed_for_new_issue: "Aucun projet ne dispose d'un tracker sur lequel vous pouvez créer une demande"
               error_move_of_child_not_possible: "La sous-tâche %{child} n'a pas pu être déplacée dans le nouveau projet : %{errors}"
               error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted: "Le temps passé ne peut pas être réaffecté à une demande qui va être supprimée"
+              warning_fields_cleared_on_bulk_edit: "Les changements apportés entraîneront la suppression automatique des valeurs d'un ou plusieurs champs sur les objets sélectionnés"
               mail_subject_lost_password: "Votre mot de passe %{value}"
               mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'

test/functional/issues_controller_test.rb +17 0

@@ -4067,6 +4067,23 class IssuesControllerTest < Redmine::ControllerTest
4067	assert_select 'input[name=?]', "issue[custom_field_values][#{field2.id}]"	4067	assert_select 'input[name=?]', "issue[custom_field_values][#{field2.id}]"
4068	end	4068	end
4069		4069
		4070	def test_bulk_edit_should_warn_about_custom_field_values_about_to_be_cleared
		4071	CustomField.delete_all
		4072
		4073	cleared = IssueCustomField.generate!(:name => 'Cleared', :tracker_ids => [2], :is_for_all => true)
		4074	CustomValue.create!(:customized => Issue.find(2), :custom_field => cleared, :value => 'foo')
		4075
		4076	not_cleared = IssueCustomField.generate!(:name => 'Not cleared', :tracker_ids => [2, 3], :is_for_all => true)
		4077	CustomValue.create!(:customized => Issue.find(2), :custom_field => not_cleared, :value => 'bar')
		4078	@request.session[:user_id] = 2
		4079
		4080	get :bulk_edit, :ids => [1, 2], :issue => {:tracker_id => 3}
		4081	assert_response :success
		4082	assert_select '.warning', :text => /automatic deletion of values/
		4083	assert_select '.warning span', :text => 'Cleared (1)'
		4084	assert_select '.warning span', :text => /Not cleared/, :count => 0
		4085	end
		4086
4070	def test_bulk_update	4087	def test_bulk_update
4071	@request.session[:user_id] = 2	4088	@request.session[:user_id] = 2
4072	# update issues priority	4089	# 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