From 702329b99fafb8b828d9b65c89389a07f21624fd Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Fri, 25 Jan 2019 10:31:53 +0100
Subject: [PATCH] Fix #683: wrong number of affected elements in bulk action
modal
---
changes/changelog.d/683.bugfix | 1 +
front/src/components/common/ActionTable.vue | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 changes/changelog.d/683.bugfix
diff --git a/changes/changelog.d/683.bugfix b/changes/changelog.d/683.bugfix
new file mode 100644
index 0000000000..18cc3a7ae2
--- /dev/null
+++ b/changes/changelog.d/683.bugfix
@@ -0,0 +1 @@
+Fixed wrong number of affected elements in bulk action modal (#683)
diff --git a/front/src/components/common/ActionTable.vue b/front/src/components/common/ActionTable.vue
index d6d19076c0..5fcaceaaca 100644
--- a/front/src/components/common/ActionTable.vue
+++ b/front/src/components/common/ActionTable.vue
@@ -36,8 +36,8 @@
<p slot="modal-header">
<translate
key="1"
- :translate-n="checked.length"
- :translate-params="{count: checked.length, action: currentActionName}"
+ :translate-n="affectedObjectsCount"
+ :translate-params="{count: affectedObjectsCount, action: currentActionName}"
translate-plural="Do you want to launch %{ action } on %{ count } elements?">
Do you want to launch %{ action } on %{ count } element?
</translate>
@@ -271,6 +271,12 @@ export default {
return {
refresh: this.$gettext('Refresh table content')
}
+ },
+ affectedObjectsCount () {
+ if (this.selectAll) {
+ return this.objectsData.count
+ }
+ return this.checked.length
}
},
watch: {
--
GitLab