MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 32816a3425 702329b99f
commit e4cb036a97
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/683.bugfix Normal file
View File

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

10
front/src/components/common/ActionTable.vue
View File

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