Skip to content
Snippets Groups Projects
Commit e4cb036a authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '683-select-all-messages' into 'master'

Fix #683: wrong number of affected elements in bulk action modal

See merge request !559
parents 32816a34 702329b9
No related branches found
No related tags found
No related merge requests found
Fixed wrong number of affected elements in bulk action modal (#683)
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
<p slot="modal-header"> <p slot="modal-header">
<translate <translate
key="1" key="1"
:translate-n="checked.length" :translate-n="affectedObjectsCount"
:translate-params="{count: checked.length, action: currentActionName}" :translate-params="{count: affectedObjectsCount, action: currentActionName}"
translate-plural="Do you want to launch %{ action } on %{ count } elements?"> translate-plural="Do you want to launch %{ action } on %{ count } elements?">
Do you want to launch %{ action } on %{ count } element? Do you want to launch %{ action } on %{ count } element?
</translate> </translate>
...@@ -271,6 +271,12 @@ export default { ...@@ -271,6 +271,12 @@ export default {
return { return {
refresh: this.$gettext('Refresh table content') refresh: this.$gettext('Refresh table content')
} }
},
affectedObjectsCount () {
if (this.selectAll) {
return this.objectsData.count
}
return this.checked.length
} }
}, },
watch: { watch: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment