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

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

See merge request funkwhale/funkwhale!559
This commit is contained in:
Eliot Berriot 2019-01-25 10:34:19 +01:00
commit e4cb036a97
2 changed files with 9 additions and 2 deletions

View File

@ -0,0 +1 @@
Fixed wrong number of affected elements in bulk action modal (#683)

View File

@ -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: {