]> source.dussan.org Git - redmine.git/commitdiff
Updated issue delete confirmation when it has child issues. #6191
authorEric Davis <edavis@littlestreamsoftware.com>
Mon, 20 Sep 2010 02:55:26 +0000 (02:55 +0000)
committerEric Davis <edavis@littlestreamsoftware.com>
Mon, 20 Sep 2010 02:55:26 +0000 (02:55 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4105 e93f8b46-1217-0410-a6f0-8f06a7374b81

45 files changed:
app/models/issue.rb
app/views/issues/_action_menu.rhtml
config/locales/bg.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/da.yml
config/locales/de.yml
config/locales/el.yml
config/locales/en-GB.yml
config/locales/en.yml
config/locales/es.yml
config/locales/eu.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hr.yml
config/locales/hu.yml
config/locales/id.yml
config/locales/it.yml
config/locales/ja.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/lv.yml
config/locales/mk.yml
config/locales/mn.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ro.yml
config/locales/ru.yml
config/locales/sk.yml
config/locales/sl.yml
config/locales/sr-YU.yml
config/locales/sr.yml
config/locales/sv.yml
config/locales/th.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-TW.yml
config/locales/zh.yml

index 2b736258946e9721d8b842c0ab54405cf06bb6f2..c49952306b0147a242cb80f760defc692c9ab9a6 100644 (file)
@@ -382,6 +382,11 @@ class Issue < ActiveRecord::Base
     done_date = start_date + ((due_date - start_date+1)* done_ratio/100).floor
     return done_date <= Date.today
   end
+
+  # Does this issue have children?
+  def children?
+    !leaf?
+  end
   
   # Users the issue can be assigned to
   def assignable_users
index c5d17511a424f35dac1aa4b5e3bb8fd986b8b3a9..30c63ec6605c93d064412db2d0f3273e8210681d 100644 (file)
@@ -6,5 +6,5 @@
 <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
 <%= link_to_if_authorized l(:button_copy), new_issue_move_path(:id => @issue, :copy_options => {:copy => 't'}), :class => 'icon icon-copy' %>
 <%= link_to_if_authorized l(:button_move), new_issue_move_path(:id => @issue), :class => 'icon icon-move' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del' %>
 </div>
index ceee5c3cf7526a7e243d5e971a45c9e74377e1fb..e99da7062ef70c7f0ab74f56f57bfc7c30f3efe4 100644 (file)
@@ -910,3 +910,4 @@ bg:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index b855be9e9461d872417d9e467c6355bcd3e16d4d..bef17900e91f894820af4b6d01f82fd8fbda51b4 100644 (file)
@@ -930,3 +930,4 @@ bs:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 6ba0a8bea750d351a93ba8aadb4c17231a8b9e4b..38092a2a7917c6945b7424d3141a525e61e48153 100644 (file)
@@ -919,3 +919,4 @@ ca:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 71591fa4654dabfc37a21134447c1e93b54e9a25..d3cdae5efdda57d51a2e6a893cee040c37802e37 100644 (file)
@@ -916,3 +916,4 @@ cs:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index b6270f0d18ab3a477875c7fba470c7c5461c303f..25d2883364cfa577d2e9c5fb7c822a110d47a6e8 100644 (file)
@@ -932,3 +932,4 @@ da:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 3a5ee094ea9c8a6ac5ca24ddf3c9d6b37c811377..f9847c3f593858d406767828298b0336038f7191 100644 (file)
@@ -935,3 +935,4 @@ de:
 
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
+  text_are_you_sure_with_children: Delete issue and all child issues?
index d0608e851be5e64489cd3bb420be0b46d311b172..2b6e3493d69da681f146f9422ad799dc8a4df01b 100644 (file)
@@ -916,3 +916,4 @@ el:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index c0b520dfdf611c5068a7adee6e70c197b73bcf4e..4f5aec1113e369976ddcd1f6d9e08dc218edfd24 100644 (file)
@@ -920,3 +920,4 @@ en-GB:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 81a26c82cccd2dc627e884562d87136c0294dc15..2930d8079d5008866573831495c8226d45534d4f 100644 (file)
@@ -838,6 +838,7 @@ en:
   text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted."
   text_workflow_edit: Select a role and a tracker to edit the workflow
   text_are_you_sure: Are you sure ?
+  text_are_you_sure_with_children: "Delete issue and all child issues?"
   text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
   text_journal_set_to: "{{label}} set to {{value}}"
   text_journal_deleted: "{{label}} deleted ({{old}})"
index 1828558bf8015f32972c1d71e18d10e8a76bc574..18d56ae3ee059d1a82eee2dc48456ef4f50979b4 100644 (file)
@@ -956,3 +956,4 @@ es:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 64881fe6fa8c4606b3cdf7e45bf9084d675abef8..983fe1482e642264a5eb7930c0a901a8b3644402 100644 (file)
@@ -920,3 +920,4 @@ eu:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 8b56c94da474e86fd88934ea3bee9658945344bc..ea14a5c0dccdcb9345f8152f75beb5055c76fc4d 100644 (file)
@@ -941,3 +941,4 @@ fi:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 0a1ee46eaecba73a33e6546b4f8ea8cc81cce1ff..0654ee7369124a68dfcd194ef695e59e80712c64 100644 (file)
@@ -934,3 +934,4 @@ fr:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index b5345de69bf1c5909ead9543a5b11531a03e64dc..5360095f6e407e08d9b0513e5bd5af74d657cafb 100644 (file)
@@ -932,3 +932,4 @@ gl:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 8c55b2351c3dfc97a9efaf55d2acb2282e60652d..0129eff8847666a8549734575b4e06be8467a689 100644 (file)
@@ -921,3 +921,4 @@ he:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 77cda672a82e7f16315af86b2e817a345fbc9581..9219ac660416c7f6109e413cd3f391062663fbae 100644 (file)
@@ -923,3 +923,4 @@ hr:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 84e714a6b170341c3ba961b393e890b8823eed29..e099cb9bcf9782620a424c3b9058d53774b67a5d 100644 (file)
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index ca6444b0c98954b457aac82db569e3e35a2e38de..185d4f21d757bffbf74fa9fd681d4f6cab633714 100644 (file)
@@ -924,3 +924,4 @@ id:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 6bd4096a9bc21c220ba4cc3bb17a4b78dd5da027..be0da6a488bc9257e54e864cfa2d59efb5e6c8e2 100644 (file)
@@ -920,3 +920,4 @@ it:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index fa3346f17b075fb92a80df8fea8c3c1be135a383..2ea6b009ff47e609486df23e5dd255c727d2e56c 100644 (file)
@@ -941,3 +941,4 @@ ja:
   enumeration_activities: 作業分類 (時間トラッキング)
   enumeration_system_activity: システム作業分類
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 771f91cef4cac3ddfd04d7ae6f0f5ea5ddf10d07..e4dc36fb65eede8322421b703881eaba521dda2b 100644 (file)
@@ -972,3 +972,4 @@ ko:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 27c5466fd4c9b254baf1ed1df63305f4e176666e..40e58b980cd4fc57b38d2980edbd5270e8923d62 100644 (file)
@@ -980,3 +980,4 @@ lt:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 5a628e5c55e02b1c46b7ddee07fca90d482c4b01..6162f60efd0501bab275077d5f61021225188272 100644 (file)
@@ -911,3 +911,4 @@ lv:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index ac2a043d457e4c4801f88ac31ea31bdc037baf8a..fb2f78d2963d535f5aff09c1b9c9dcad9754b167 100644 (file)
@@ -916,3 +916,4 @@ mk:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 908e8a844c09219b24b4ce5838068da63db32b45..5358657eb3e5d250f176a18c946998fbfbe9c5c0 100644 (file)
@@ -917,3 +917,4 @@ mn:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index b5933d2222fc2815de8bfe406ed2481a66689d48..071b3919e0142c9c67b49c08ebfec43b7199521f 100644 (file)
@@ -898,3 +898,4 @@ nl:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 24be1a06e2f763d4ae5ced0ce8a7706577d7d98b..4b76683fce8e31296bed3b035ad82cc0415b3760 100644 (file)
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index aade4af0e1b279b97a81db883114d9ebd09b36fe..b56fd71ebfc2c9dfd54f61ef516123b834d81bed 100644 (file)
@@ -937,3 +937,4 @@ pl:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 7fa9ae2f5183bf14aef668abc0d1540827e1f374..ee1aefac5ab7d514f7209d1ebc17f9876fab19c9 100644 (file)
@@ -940,3 +940,4 @@ pt-BR:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 9a7547ab49a1a2f4001cb7ab7932a2544e118daf..cb336e25a9cba98ff48916f90190cedd56b5428a 100644 (file)
@@ -924,3 +924,4 @@ pt:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index aac64cc2b8cbe93ec994fb067416ff4f3b9e42f5..2e8f7a1ca2226c1aa610e3dea9e85dc488bc7007 100644 (file)
@@ -909,3 +909,4 @@ ro:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 827ed52eeecd16ea18932689fb8f7701377f846c..08e1acb9588097bfbac1f2efc7be4a62b3925178 100644 (file)
@@ -1033,3 +1033,4 @@ ru:
   notice_unable_delete_time_entry: Невозможно удалить запись журнала.
   label_overall_spent_time: Всего затрачено времени
 
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 87c50e27a764a4f92b324667fa4fda215728a111..37c5ea6b1d41af56a0d98591a0d68d1a78a05f0e 100644 (file)
@@ -911,3 +911,4 @@ sk:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 3b579a8244ff256b62c704cabd266955a300b700..6732ef98d5524b9e357fd26167ff2a6040074fd3 100644 (file)
@@ -912,3 +912,4 @@ sl:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index b48e90223db73a354c021aa789042619b19b3d51..d73fd03400a4ace8d3838bf7cc8c3ba3da96761e 100644 (file)
@@ -916,3 +916,4 @@ sr-YU:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 8282a37bf7750dc2043d7d49b180bf01dadf91cc..1b6a8d334ac4a64c616efbc68482be5b49eadc0b 100644 (file)
@@ -917,3 +917,4 @@ sr:
   field_assigned_to_role: Member of Role
 
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 28ce75e21c02e69f6c7a47e679bddc6c4ce3716d..439f9c7cdb5c0a72e99636d6b22f810efbdb0259 100644 (file)
@@ -961,3 +961,4 @@ sv:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 859cf0f08b9acc33e55a996a2dc12a92d966c89f..bc936f709b1fc2d2eba0d545bb3814863de44ba3 100644 (file)
@@ -913,3 +913,4 @@ th:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 9244d983d43c96af7d18be6a134af835f4e71e10..4b0e6022c69f4c3a9bc2632d7cfe3941524ace96 100644 (file)
@@ -939,3 +939,4 @@ tr:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index eade7c4a220e3821631a5c5ba91d709e9c65809b..146454da44a641fa322f52a82e7465b07f20f417 100644 (file)
@@ -912,3 +912,4 @@ uk:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 94fbad869190d0b1a3530b482fe190b8c84a08eb..8cf978d09b4bfe26bcecee804d3b5aa291743f17 100644 (file)
@@ -971,3 +971,4 @@ vi:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 3cfa4248aff43f4b6cc129a63fe0c1cea09b7bf4..38efcfa9d4d37432a982b898d633577d435cb2bd 100644 (file)
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
 
+  text_are_you_sure_with_children: Delete issue and all child issues?
index 3b788860da2e8194b8238b55c67f760258a784fd..a7611bf1da886e01a39ceae532e94d395d8e8928 100644 (file)
@@ -934,3 +934,4 @@ zh:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
+  text_are_you_sure_with_children: Delete issue and all child issues?