jro_apps/redmine Commit - r5375:f89d04074e56

0

app/controllers/context_menus_controller.rb +1 0

             class ContextMenusController < ApplicationController
               helper :watchers
+              helper :issues
               def issues
                 @issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project)

0

app/helpers/issues_helper.rb +18 0

@@ -109,6 +109,24 module IssuesHelper
109	s	109	s
110	end	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	def sidebar_queries	130	def sidebar_queries
113	unless @sidebar_queries	131	unless @sidebar_queries
114	# User can see public queries and his own queries	132	# User can see public queries and his own queries

0

app/views/context_menus/issues.html.erb +1 -1

               <li><%= context_menu_link l(:button_move), new_issue_move_path(:ids => @issues.collect(&:id)),
             	                        :class => 'icon-move', :disabled => !@can[:move]  %></li>
               <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id), :back_url => @back},
-                                        :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %></li>
+                                        :method => :post, :confirm => issues_destroy_confirmation_message(@issues), :class => 'icon-del', :disabled => !@can[:delete] %></li>
               <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
             </ul>

0

app/views/issues/_action_menu.rhtml +1 -1

             <%= 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), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
             <%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %>
-            <%= 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' %>
+            <%= 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' %>
             </div>

0

config/locales/bg.yml +1 0

               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/bs.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/ca.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/cs.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/da.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/de.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/el.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/en-GB.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/en.yml +1 0

               text_status_changed_by_changeset: "Applied in changeset %{value}."
               text_time_logged_by_changeset: "Applied in changeset %{value}."
               text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s)?'
+              text_issues_destroy_descendants_confirmation: "This will also delete %{count} subtask(s)."
               text_time_entries_destroy_confirmation: 'Are you sure you want to delete the selected time entr(y/ies)?'
               text_select_project_modules: 'Select modules to enable for this project:'
               text_default_administrator_account_changed: Default administrator account changed

0

config/locales/es.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/eu.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/fa.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/fi.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/fr.yml +2 -1

               text_load_default_configuration: Charger le paramétrage par défaut
               text_status_changed_by_changeset: "Appliqué par commit %{value}."
               text_time_logged_by_changeset: "Appliqué par commit %{value}"
-              text_issues_destroy_confirmation: 'Êtes-vous sûr de vouloir supprimer le(s) demandes(s) selectionnée(s) ?'
+              text_issues_destroy_confirmation: 'Êtes-vous sûr de vouloir supprimer la ou les demandes(s) selectionnée(s) ?'
+              text_issues_destroy_descendants_confirmation: "Cela entrainera également la suppression de %{count} sous-tâche(s)."
               text_select_project_modules: 'Sélectionner les modules à activer pour ce projet :'
               text_default_administrator_account_changed: Compte administrateur par défaut changé
               text_file_repository_writable: Répertoire de stockage des fichiers accessible en écriture

0

config/locales/gl.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/he.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/hr.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/hu.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/id.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/it.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/ja.yml +1 0

               field_is_private: プライベート
               permission_set_issues_private: チケットをプライベートに設定
               label_issues_visibility_public: プライベートチケット以外
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/ko.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/lt.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/lv.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/mk.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/mn.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/nl.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/no.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/pl.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/pt-BR.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/pt.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/ro.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/ru.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/sk.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/sl.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/sr-YU.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/sr.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/sv.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/th.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/tr.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/uk.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/vi.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/zh-TW.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

config/locales/zh.yml +1 0

               field_is_private: Private
               permission_set_issues_private: Set issues public or private
               label_issues_visibility_public: All non private issues
+              text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).

0

test/unit/helpers/issues_helper_test.rb +19 0

@@ -47,6 +47,25 class IssuesHelperTest < HelperTestCase
47	def test_issue_heading	47	def test_issue_heading
48	assert_equal "Bug #1", issue_heading(Issue.find(1))	48	assert_equal "Bug #1", issue_heading(Issue.find(1))
49	end	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	context "IssuesHelper#show_detail" do	70	context "IssuesHelper#show_detail" do
52	context "with no_html" do	71	context "with no_html" do

	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