Browse Source

Change the "Edit" label in the context menu to "Bulk Edit" when multiple issues are selected (#35770).

Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21248 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/5.0.0
Go MAEDA 2 years ago
parent
commit
ac8aa6b1f3

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

@@ -5,7 +5,7 @@
<li><%= context_menu_link l(:button_edit), edit_issue_path(@issue),
:class => 'icon icon-edit', :disabled => !@can[:edit] %></li>
<% else %>
<li><%= context_menu_link l(:button_edit), bulk_edit_issues_path(:ids => @issue_ids),
<li><%= context_menu_link l(:label_bulk_edit), bulk_edit_issues_path(:ids => @issue_ids),
:class => 'icon icon-edit', :disabled => !@can[:edit] %></li>
<% end %>


+ 1
- 1
app/views/context_menus/time_entries.html.erb View File

@@ -3,7 +3,7 @@
<li><%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => @time_entry},
:class => 'icon icon-edit', :disabled => !@can[:edit] %></li>
<% else %>
<li><%= context_menu_link l(:button_edit), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id)},
<li><%= context_menu_link l(:label_bulk_edit), {:controller => 'timelog', :action => 'bulk_edit', :ids => @time_entries.collect(&:id)},
:class => 'icon icon-edit', :disabled => !@can[:edit] %></li>
<% end %>


+ 1
- 0
config/locales/en.yml View File

@@ -928,6 +928,7 @@ en:
label_changeset_plural: Changesets
label_default_columns: Default columns
label_no_change_option: (No change)
label_bulk_edit: Bulk edit
label_bulk_edit_selected_issues: Bulk edit selected issues
label_bulk_edit_selected_time_entries: Bulk edit selected time entries
label_theme: Theme

+ 1
- 0
config/locales/ja.yml View File

@@ -757,6 +757,7 @@ ja:
label_changeset_plural: 更新履歴
label_default_columns: デフォルトの項目
label_no_change_option: (変更無し)
label_bulk_edit: 一括編集
label_bulk_edit_selected_issues: チケットの一括編集
label_theme: テーマ
label_default: デフォルト

+ 6
- 6
test/functional/context_menus_controller_test.rb View File

@@ -70,7 +70,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest
}
assert_response :success

assert_select 'a.icon-edit[href=?]', '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2', :text => 'Edit'
assert_select 'a.icon-edit[href=?]', '/issues/bulk_edit?ids%5B%5D=1&ids%5B%5D=2', :text => 'Bulk edit'
assert_select 'a.icon-copy[href=?]', '/issues/bulk_edit?copy=1&ids%5B%5D=1&ids%5B%5D=2', :text => 'Copy'
assert_select 'a.icon-del[href=?]', '/issues?ids%5B%5D=1&ids%5B%5D=2', :text => 'Delete'

@@ -112,7 +112,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest

ids = [1, 2].map {|i| "ids%5B%5D=#{i}"}.join('&')

assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Edit'
assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Bulk edit'
# issue_id: '1,2', set_filter: 1, status_id: '*'
assert_select 'a.icon-copy-link[data-clipboard-text=?]', "http://test.host/projects/ecookbook/issues?issue_id=1%2C2&set_filter=1&status_id=%2A", :text => 'Copy link'
assert_select 'a.icon-copy[href=?]', "/issues/bulk_edit?copy=1&#{ids}", :text => 'Copy'
@@ -135,7 +135,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest

ids = [1, 2, 6].map {|i| "ids%5B%5D=#{i}"}.join('&')

assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Edit'
assert_select 'a.icon-edit[href=?]', "/issues/bulk_edit?#{ids}", :text => 'Bulk edit'
# issue_id: '1,2,6', set_filter: 1, status_id: '*'
assert_select 'a.icon-copy-link[data-clipboard-text=?]', "http://test.host/issues?issue_id=1%2C2%2C6&set_filter=1&status_id=%2A", :text => 'Copy link'
assert_select 'a.icon-del[href=?]', "/issues?#{ids}", :text => 'Delete'
@@ -402,7 +402,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest
)
assert_response :success

assert_select 'a:not(.disabled)', :text => 'Edit'
assert_select 'a:not(.disabled)', :text => 'Bulk edit'
end

def test_context_menu_for_one_time_entry
@@ -454,7 +454,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest
)
assert_response :success

assert_select 'a:not(.disabled)', :text => 'Edit'
assert_select 'a:not(.disabled)', :text => 'Bulk edit'
end

def test_time_entries_context_menu_without_edit_permission
@@ -468,6 +468,6 @@ class ContextMenusControllerTest < Redmine::ControllerTest
)
assert_response :success

assert_select 'a.disabled', :text => 'Edit'
assert_select 'a.disabled', :text => 'Bulk edit'
end
end

Loading…
Cancel
Save