##// END OF EJS Templates
jro_apps » redmine
RSS
Warn about subtasks before deleting a parent issue (#6562)....
Jean-Philippe Lang -
r5375:f89d04074e56
parent child
Show More
Side by Side Unified
Context file:
r5375:f89d04074e56 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,5 +1,6
1 1 class ContextMenusController < ApplicationController
2 2 helper :watchers
3 helper :issues
3 4
4 5 def issues
5 6 @issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project)
Show file before | Show file after | Hide comments
@@ -109,6 +109,24 module IssuesHelper
109 109 s
110 110 end
111 111
112 def issues_destroy_confirmation_message(issues)
113 issues = [issues] unless issues.is_a?(Array)
114 message = l(:text_issues_destroy_confirmation)
115 descendant_count = issues.inject(0) {|memo, i| memo += (i.right - i.left - 1)/2}
116 if descendant_count > 0
117 issues.each do |issue|
118 next if issue.root?
119 issues.each do |other_issue|
120 descendant_count -= 1 if issue.is_descendant_of?(other_issue)
121 end
122 end
123 if descendant_count > 0
124 message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
125 end
126 end
127 message
128 end
129
112 130 def sidebar_queries
113 131 unless @sidebar_queries
114 132 # User can see public queries and his own queries
Show file before | Show file after | Hide comments
@@ -115,7 +115,7
115 115 <li><%= context_menu_link l(:button_move), new_issue_move_path(:ids => @issues.collect(&:id)),
116 116 :class => 'icon-move', :disabled => !@can[:move] %></li>
117 117 <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id), :back_url => @back},
118 :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %></li>
118 :method => :post, :confirm => issues_destroy_confirmation_message(@issues), :class => 'icon-del', :disabled => !@can[:delete] %></li>
119 119
120 120 <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
121 121 </ul>
Show file before | Show file after | Hide comments
@@ -5,5 +5,5
5 5 <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
6 6 <%= link_to_if_authorized l(:button_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
7 7 <%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %>
8 <%= 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' %>
8 <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => issues_destroy_confirmation_message(@issue), :method => :post, :class => 'icon icon-del' %>
9 9 </div>
Show file before | Show file after | Hide comments
@@ -960,3 +960,4 bg:
960 960 permission_set_issues_private: Set issues public or private
961 961 label_issues_visibility_public: All non private issues
962 962
963 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -973,3 +973,4 bs:
973 973 field_is_private: Private
974 974 permission_set_issues_private: Set issues public or private
975 975 label_issues_visibility_public: All non private issues
976 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -962,3 +962,4 ca:
962 962 field_is_private: Private
963 963 permission_set_issues_private: Set issues public or private
964 964 label_issues_visibility_public: All non private issues
965 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -963,3 +963,4 cs:
963 963 field_is_private: Private
964 964 permission_set_issues_private: Set issues public or private
965 965 label_issues_visibility_public: All non private issues
966 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -975,3 +975,4 da:
975 975 field_is_private: Private
976 976 permission_set_issues_private: Set issues public or private
977 977 label_issues_visibility_public: All non private issues
978 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -976,3 +976,4 de:
976 976 field_is_private: Private
977 977 permission_set_issues_private: Set issues public or private
978 978 label_issues_visibility_public: All non private issues
979 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -959,3 +959,4 el:
959 959 field_is_private: Private
960 960 permission_set_issues_private: Set issues public or private
961 961 label_issues_visibility_public: All non private issues
962 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -962,3 +962,4 en-GB:
962 962 field_is_private: Private
963 963 permission_set_issues_private: Set issues public or private
964 964 label_issues_visibility_public: All non private issues
965 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -906,6 +906,7 en:
906 906 text_status_changed_by_changeset: "Applied in changeset %{value}."
907 907 text_time_logged_by_changeset: "Applied in changeset %{value}."
908 908 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s)?'
909 text_issues_destroy_descendants_confirmation: "This will also delete %{count} subtask(s)."
909 910 text_time_entries_destroy_confirmation: 'Are you sure you want to delete the selected time entr(y/ies)?'
910 911 text_select_project_modules: 'Select modules to enable for this project:'
911 912 text_default_administrator_account_changed: Default administrator account changed
Show file before | Show file after | Hide comments
@@ -996,3 +996,4 es:
996 996 field_is_private: Private
997 997 permission_set_issues_private: Set issues public or private
998 998 label_issues_visibility_public: All non private issues
999 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -963,3 +963,4 eu:
963 963 field_is_private: Private
964 964 permission_set_issues_private: Set issues public or private
965 965 label_issues_visibility_public: All non private issues
966 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -962,3 +962,4 fa:
962 962 field_is_private: Private
963 963 permission_set_issues_private: Set issues public or private
964 964 label_issues_visibility_public: All non private issues
965 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -980,3 +980,4 fi:
980 980 field_is_private: Private
981 981 permission_set_issues_private: Set issues public or private
982 982 label_issues_visibility_public: All non private issues
983 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -883,7 +883,8 fr:
883 883 text_load_default_configuration: Charger le paramétrage par défaut
884 884 text_status_changed_by_changeset: "Appliqué par commit %{value}."
885 885 text_time_logged_by_changeset: "Appliqué par commit %{value}"
886 text_issues_destroy_confirmation: 'Êtes-vous sûr de vouloir supprimer le(s) demandes(s) selectionnée(s) ?'
886 text_issues_destroy_confirmation: 'Êtes-vous sûr de vouloir supprimer la ou les demandes(s) selectionnée(s) ?'
887 text_issues_destroy_descendants_confirmation: "Cela entrainera également la suppression de %{count} sous-tâche(s)."
887 888 text_select_project_modules: 'Sélectionner les modules à activer pour ce projet :'
888 889 text_default_administrator_account_changed: Compte administrateur par défaut changé
889 890 text_file_repository_writable: Répertoire de stockage des fichiers accessible en écriture
Show file before | Show file after | Hide comments
@@ -971,3 +971,4 gl:
971 971 field_is_private: Private
972 972 permission_set_issues_private: Set issues public or private
973 973 label_issues_visibility_public: All non private issues
974 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -964,3 +964,4 he:
964 964 field_is_private: Private
965 965 permission_set_issues_private: Set issues public or private
966 966 label_issues_visibility_public: All non private issues
967 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -966,3 +966,4 hr:
966 966 field_is_private: Private
967 967 permission_set_issues_private: Set issues public or private
968 968 label_issues_visibility_public: All non private issues
969 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -978,3 +978,4
978 978 field_is_private: Private
979 979 permission_set_issues_private: Set issues public or private
980 980 label_issues_visibility_public: All non private issues
981 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -967,3 +967,4 id:
967 967 field_is_private: Private
968 968 permission_set_issues_private: Set issues public or private
969 969 label_issues_visibility_public: All non private issues
970 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -960,3 +960,4 it:
960 960 field_is_private: Private
961 961 permission_set_issues_private: Set issues public or private
962 962 label_issues_visibility_public: All non private issues
963 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -982,3 +982,4 ja:
982 982 field_is_private: プライベート
983 983 permission_set_issues_private: チケットをプライベートに設定
984 984 label_issues_visibility_public: プライベートチケット以外
985 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -1011,3 +1011,4 ko:
1011 1011 field_is_private: Private
1012 1012 permission_set_issues_private: Set issues public or private
1013 1013 label_issues_visibility_public: All non private issues
1014 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -1019,3 +1019,4 lt:
1019 1019 field_is_private: Private
1020 1020 permission_set_issues_private: Set issues public or private
1021 1021 label_issues_visibility_public: All non private issues
1022 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -954,3 +954,4 lv:
954 954 field_is_private: Private
955 955 permission_set_issues_private: Set issues public or private
956 956 label_issues_visibility_public: All non private issues
957 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -959,3 +959,4 mk:
959 959 field_is_private: Private
960 960 permission_set_issues_private: Set issues public or private
961 961 label_issues_visibility_public: All non private issues
962 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -960,3 +960,4 mn:
960 960 field_is_private: Private
961 961 permission_set_issues_private: Set issues public or private
962 962 label_issues_visibility_public: All non private issues
963 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -941,3 +941,4 nl:
941 941 field_is_private: Private
942 942 permission_set_issues_private: Set issues public or private
943 943 label_issues_visibility_public: All non private issues
944 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -946,3 +946,4
946 946 field_is_private: Private
947 947 permission_set_issues_private: Set issues public or private
948 948 label_issues_visibility_public: All non private issues
949 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -976,3 +976,4 pl:
976 976 field_is_private: Private
977 977 permission_set_issues_private: Set issues public or private
978 978 label_issues_visibility_public: All non private issues
979 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -979,3 +979,4 pt-BR:
979 979 field_is_private: Private
980 980 permission_set_issues_private: Set issues public or private
981 981 label_issues_visibility_public: All non private issues
982 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -964,3 +964,4 pt:
964 964 field_is_private: Private
965 965 permission_set_issues_private: Set issues public or private
966 966 label_issues_visibility_public: All non private issues
967 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -952,3 +952,4 ro:
952 952 field_is_private: Private
953 953 permission_set_issues_private: Set issues public or private
954 954 label_issues_visibility_public: All non private issues
955 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -1072,3 +1072,4 ru:
1072 1072 field_is_private: Private
1073 1073 permission_set_issues_private: Set issues public or private
1074 1074 label_issues_visibility_public: All non private issues
1075 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -954,3 +954,4 sk:
954 954 field_is_private: Private
955 955 permission_set_issues_private: Set issues public or private
956 956 label_issues_visibility_public: All non private issues
957 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -955,3 +955,4 sl:
955 955 field_is_private: Private
956 956 permission_set_issues_private: Set issues public or private
957 957 label_issues_visibility_public: All non private issues
958 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -959,3 +959,4 sr-YU:
959 959 field_is_private: Private
960 960 permission_set_issues_private: Set issues public or private
961 961 label_issues_visibility_public: All non private issues
962 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -960,3 +960,4 sr:
960 960 field_is_private: Private
961 961 permission_set_issues_private: Set issues public or private
962 962 label_issues_visibility_public: All non private issues
963 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -1000,3 +1000,4 sv:
1000 1000 field_is_private: Private
1001 1001 permission_set_issues_private: Set issues public or private
1002 1002 label_issues_visibility_public: All non private issues
1003 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -956,3 +956,4 th:
956 956 field_is_private: Private
957 957 permission_set_issues_private: Set issues public or private
958 958 label_issues_visibility_public: All non private issues
959 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -978,3 +978,4 tr:
978 978 field_is_private: Private
979 979 permission_set_issues_private: Set issues public or private
980 980 label_issues_visibility_public: All non private issues
981 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -955,3 +955,4 uk:
955 955 field_is_private: Private
956 956 permission_set_issues_private: Set issues public or private
957 957 label_issues_visibility_public: All non private issues
958 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -1010,3 +1010,4 vi:
1010 1010 field_is_private: Private
1011 1011 permission_set_issues_private: Set issues public or private
1012 1012 label_issues_visibility_public: All non private issues
1013 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -1041,3 +1041,4
1041 1041 field_is_private: Private
1042 1042 permission_set_issues_private: Set issues public or private
1043 1043 label_issues_visibility_public: All non private issues
1044 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -973,3 +973,4 zh:
973 973 field_is_private: Private
974 974 permission_set_issues_private: Set issues public or private
975 975 label_issues_visibility_public: All non private issues
976 text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
Show file before | Show file after | Hide comments
@@ -47,6 +47,25 class IssuesHelperTest < HelperTestCase
47 47 def test_issue_heading
48 48 assert_equal "Bug #1", issue_heading(Issue.find(1))
49 49 end
50
51 def test_issues_destroy_confirmation_message_with_one_root_issue
52 assert_equal l(:text_issues_destroy_confirmation), issues_destroy_confirmation_message(Issue.find(1))
53 end
54
55 def test_issues_destroy_confirmation_message_with_an_arrayt_of_root_issues
56 assert_equal l(:text_issues_destroy_confirmation), issues_destroy_confirmation_message(Issue.find([1, 2]))
57 end
58
59 def test_issues_destroy_confirmation_message_with_one_parent_issue
60 Issue.find(2).update_attribute :parent_issue_id, 1
61 assert_equal l(:text_issues_destroy_confirmation) + "\n" + l(:text_issues_destroy_descendants_confirmation, :count => 1),
62 issues_destroy_confirmation_message(Issue.find(1))
63 end
64
65 def test_issues_destroy_confirmation_message_with_one_parent_issue_and_its_child
66 Issue.find(2).update_attribute :parent_issue_id, 1
67 assert_equal l(:text_issues_destroy_confirmation), issues_destroy_confirmation_message(Issue.find([1, 2]))
68 end
50 69
51 70 context "IssuesHelper#show_detail" do
52 71 context "with no_html" do
General Comments 0
You need to be logged in to leave comments. Login now