Show an error message when changing an issue's project fails due to errors in child...

git-svn-id: http://svn.redmine.org/redmine/trunk@16089 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/issue.rb b/app/models/issue.rb
index e49890e1a8a415d5053dcdc7e226bac0cb0e1118..b515c4a74146de98d4ad6bf8f266a30ec9defcff 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1471,6 +1471,7 @@ class Issue < ActiveRecord::Base
       # Change project and keep project
       child.send :project=, project, true
       unless child.save
+        errors.add :base, l(:error_move_of_child_not_possible, :child => "##{child.id}", :errors => child.errors.full_messages.join(", "))
         raise ActiveRecord::Rollback
       end
     end

diff --git a/config/locales/de.yml b/config/locales/de.yml
index fbb6f9f13618d066805257c794dcbc3f34482f17..90fd0a63ea03b40ee2d2596d2cf97342ff2a29f3 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -270,6 +270,7 @@ de:
   error_unable_to_connect: Fehler beim Verbinden (%{value})
   error_workflow_copy_source: Bitte wählen Sie einen Quell-Tracker und eine Quell-Rolle.
   error_workflow_copy_target: Bitte wählen Sie die Ziel-Tracker und -Rollen.
+  error_move_of_child_not_possible: "Unteraufgabe %{child} nicht in das neue Projekt verschoben werden konnten: %{errors}"
 
   field_account: Konto
   field_active: Aktiv

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 669ea472f3c5af81e588455c65726bf454ae54c9..d5a854f19ab1c8402931647f1eaac4abf62baffe 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -216,6 +216,7 @@ en:
   error_ldap_bind_credentials: "Invalid LDAP Account/Password"
   error_no_tracker_allowed_for_new_issue_in_project: "The project doesn't have any trackers for which you can create an issue"
   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}"
 
   mail_subject_lost_password: "Your %{value} password"
   mail_body_lost_password: 'To change your password, click on the following link:'

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a55c1883b0c45f917b36fae9a0d9563afbb3bb4b..757aa5b489fd10ab5fcce712574379c7a92ae808 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -236,6 +236,7 @@ fr:
   error_ldap_bind_credentials: "Identifiant ou mot de passe LDAP incorrect"
   error_no_tracker_allowed_for_new_issue_in_project: "Le projet ne dispose d'aucun tracker sur lequel vous pouvez créer une demande"
   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}"
 
   mail_subject_lost_password: "Votre mot de passe %{value}"
   mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'

diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index e4e611153a70366bc7f894b8e0d07b11d1758774..844ed5934faed10ede8b6d6933119d4c86072ccc 100644 (file)
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -1709,6 +1709,18 @@ class IssueTest < ActiveSupport::TestCase
     assert_equal 3, issue.tracker_id
   end
 
+  def test_move_to_another_project_should_set_error_message_on_child_failure
+    parent = Issue.generate!
+    child = Issue.generate!(:parent_issue_id => parent.id, :tracker_id => 2)
+    project = Project.generate!(:tracker_ids => [1])
+
+    parent.reload
+    parent.project_id = project.id
+    assert !parent.save
+    assert_include "Subtask ##{child.id} could not be moved to the new project: Tracker is not included in the list",
+      parent.errors[:base]
+  end
+
   def test_copy_to_the_same_project
     issue = Issue.find(1)
     copy = issue.copy