From 9f556a0a1bdfd631f754e1e66ccdfb00d1393c7c Mon Sep 17 00:00:00 2001
From: Marco Zille <marco.zille@gmail.com>
Date: Fri, 22 Mar 2024 19:53:38 +0000
Subject: [PATCH] Changed the update button the for bulk edit of mrs and issues
---
app/views/shared/issuable/_bulk_update_sidebar.html.haml | 2 +-
doc/user/group/epics/manage_epics.md | 2 +-
doc/user/project/issues/managing_issues.md | 4 ++--
doc/user/project/merge_requests/reviews/index.md | 4 ++--
.../javascripts/epics_list/components/epics_list_root.vue | 2 +-
.../shared/issuable/_group_bulk_update_sidebar.html.haml | 2 +-
ee/spec/features/epics/epics_list_spec.rb | 4 ++--
ee/spec/features/issues/user_bulk_edits_issues_spec.rb | 2 +-
locale/gitlab.pot | 6 +++---
spec/features/issues/user_bulk_edits_issues_labels_spec.rb | 2 +-
spec/features/issues/user_bulk_edits_issues_spec.rb | 2 +-
spec/features/merge_requests/user_mass_updates_spec.rb | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/app/views/shared/issuable/_bulk_update_sidebar.html.haml b/app/views/shared/issuable/_bulk_update_sidebar.html.haml
index 5738d5efdbf7b..4bf8e18c7726a 100644
--- a/app/views/shared/issuable/_bulk_update_sidebar.html.haml
+++ b/app/views/shared/issuable/_bulk_update_sidebar.html.haml
@@ -8,7 +8,7 @@
.block.issuable-sidebar-header
.filter-item.inline.update-issues-btn.float-left
= render Pajamas::ButtonComponent.new(variant: :confirm, button_options: { type: 'submit', disabled: true, class: 'js-update-selected-issues' }) do
- = _('Update all')
+ = _('Update selected')
= render Pajamas::ButtonComponent.new(button_options: { class: 'js-bulk-update-menu-hide gl-float-right' }) do
= _('Cancel')
- if params[:state] != 'merged'
diff --git a/doc/user/group/epics/manage_epics.md b/doc/user/group/epics/manage_epics.md
index 74acf9d854a68..bb4f907b77225 100644
--- a/doc/user/group/epics/manage_epics.md
+++ b/doc/user/group/epics/manage_epics.md
@@ -135,7 +135,7 @@ To update multiple epics at the same time:
1. Select **Bulk edit**. A sidebar on the right appears with editable fields.
1. Select the checkboxes next to each epic you want to edit.
1. Select the appropriate fields and their values from the sidebar.
-1. Select **Update all**.
+1. Select **Update selected**.
## Delete an epic
diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md
index 2061af0e5fccf..3640fcab77122 100644
--- a/doc/user/project/issues/managing_issues.md
+++ b/doc/user/project/issues/managing_issues.md
@@ -63,7 +63,7 @@ To edit multiple issues at the same time:
1. Select **Bulk edit**. A sidebar on the right of your screen appears.
1. Select the checkboxes next to each issue you want to edit.
1. From the sidebar, edit the available fields.
-1. Select **Update all**.
+1. Select **Update selected**.
When bulk editing issues in a project, you can edit the following attributes:
@@ -101,7 +101,7 @@ To edit multiple issues at the same time:
1. Select **Bulk edit**. A sidebar on the right of your screen appears.
1. Select the checkboxes next to each issue you want to edit.
1. From the sidebar, edit the available fields.
-1. Select **Update all**.
+1. Select **Update selected**.
When bulk editing issues in a group, you can edit the following attributes:
diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md
index 4dfd3d3f2703e..976b301f2e737 100644
--- a/doc/user/project/merge_requests/reviews/index.md
+++ b/doc/user/project/merge_requests/reviews/index.md
@@ -290,7 +290,7 @@ To update multiple project merge requests at the same time:
editable fields.
1. Select the checkboxes next to each merge request you want to edit.
1. Select the appropriate fields and their values from the sidebar.
-1. Select **Update all**.
+1. Select **Update selected**.
## Bulk edit merge requests at the group level
@@ -312,7 +312,7 @@ To update multiple group merge requests at the same time:
editable fields.
1. Select the checkboxes next to each merge request you want to edit.
1. Select the appropriate fields and their values from the sidebar.
-1. Select **Update all**.
+1. Select **Update selected**.
## Associated features
diff --git a/ee/app/assets/javascripts/epics_list/components/epics_list_root.vue b/ee/app/assets/javascripts/epics_list/components/epics_list_root.vue
index 7e26767497b73..e09d78894280b 100644
--- a/ee/app/assets/javascripts/epics_list/components/epics_list_root.vue
+++ b/ee/app/assets/javascripts/epics_list/components/epics_list_root.vue
@@ -301,7 +301,7 @@ export default {
form="epics-list-bulk-edit"
:disabled="checkedIssuables.length === 0 || bulkEditInProgress"
:loading="bulkEditInProgress"
- >{{ __('Update all') }}</gl-button
+ >{{ __('Update selected') }}</gl-button
>
<gl-button class="gl-float-right" @click="showBulkEditSidebar = false">{{
__('Cancel')
diff --git a/ee/app/views/shared/issuable/_group_bulk_update_sidebar.html.haml b/ee/app/views/shared/issuable/_group_bulk_update_sidebar.html.haml
index c03aa17870236..de3bee0f5b9a8 100644
--- a/ee/app/views/shared/issuable/_group_bulk_update_sidebar.html.haml
+++ b/ee/app/views/shared/issuable/_group_bulk_update_sidebar.html.haml
@@ -8,7 +8,7 @@
.block.issuable-sidebar-header
.filter-item.inline.update-issues-btn{ class: '!gl-float-left' }
= render Pajamas::ButtonComponent.new(variant: :confirm, disabled: true, button_options: { type: 'submit', class: 'js-update-selected-issues' }) do
- = _('Update all')
+ = _('Update selected')
= render Pajamas::ButtonComponent.new(button_options: { class: 'js-bulk-update-menu-hide gl-float-right' }) do
= _('Cancel')
- if is_issue
diff --git a/ee/spec/features/epics/epics_list_spec.rb b/ee/spec/features/epics/epics_list_spec.rb
index 4265640fb843e..50bfa314543dd 100644
--- a/ee/spec/features/epics/epics_list_spec.rb
+++ b/ee/spec/features/epics/epics_list_spec.rb
@@ -147,7 +147,7 @@
click_button 'Bulk edit'
page.within('.issuable-list-container aside.right-sidebar') do
- expect(page).to have_button('Update all', disabled: true)
+ expect(page).to have_button('Update selected', disabled: true)
expect(page).to have_button('Cancel')
expect(page).to have_selector('form#epics-list-bulk-edit')
@@ -182,7 +182,7 @@
wait_for_requests
click_link bug_label.title
- click_button 'Update all'
+ click_button 'Update selected'
wait_for_requests
end
diff --git a/ee/spec/features/issues/user_bulk_edits_issues_spec.rb b/ee/spec/features/issues/user_bulk_edits_issues_spec.rb
index 1d66e3fb13727..b98e1078c867f 100644
--- a/ee/spec/features/issues/user_bulk_edits_issues_spec.rb
+++ b/ee/spec/features/issues/user_bulk_edits_issues_spec.rb
@@ -217,7 +217,7 @@
end
def update_issues
- click_button 'Update all'
+ click_button 'Update selected'
wait_for_requests
end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 4e310d47ed05c..8f4fe4d9a82e6 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -54162,9 +54162,6 @@ msgstr ""
msgid "Update Scheduled…"
msgstr ""
-msgid "Update all"
-msgstr ""
-
msgid "Update appearance settings"
msgstr ""
@@ -54183,6 +54180,9 @@ msgstr ""
msgid "Update now"
msgstr ""
+msgid "Update selected"
+msgstr ""
+
msgid "Update username"
msgstr ""
diff --git a/spec/features/issues/user_bulk_edits_issues_labels_spec.rb b/spec/features/issues/user_bulk_edits_issues_labels_spec.rb
index f82b18f3dd7db..97353f940e8dd 100644
--- a/spec/features/issues/user_bulk_edits_issues_labels_spec.rb
+++ b/spec/features/issues/user_bulk_edits_issues_labels_spec.rb
@@ -455,7 +455,7 @@ def uncheck_issue(issue)
end
def update_issues
- click_button 'Update all'
+ click_button 'Update selected'
wait_for_requests
end
diff --git a/spec/features/issues/user_bulk_edits_issues_spec.rb b/spec/features/issues/user_bulk_edits_issues_spec.rb
index 4c93a8e1c7a93..9a5f260e9e4e3 100644
--- a/spec/features/issues/user_bulk_edits_issues_spec.rb
+++ b/spec/features/issues/user_bulk_edits_issues_spec.rb
@@ -138,7 +138,7 @@ def click_update_assignee_button
end
def click_update_issues_button
- click_button 'Update all'
+ click_button 'Update selected'
wait_for_requests
end
end
diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb
index 2fa70b1495799..c4768eb20ab89 100644
--- a/spec/features/merge_requests/user_mass_updates_spec.rb
+++ b/spec/features/merge_requests/user_mass_updates_spec.rb
@@ -136,7 +136,7 @@ def change_milestone(text)
end
def click_update_merge_requests_button
- click_button 'Update all'
+ click_button 'Update selected'
wait_for_requests
end
end
--
GitLab