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

See #223: delete actions is now dangerous anc cannot be applied to all files

This commit is contained in:
Eliot Berriot 2018-05-29 22:22:51 +02:00
parent 7b84a988fd
commit 256d98b77d
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/funkwhale_api/manage/serializers.py
View File

@ -74,6 +74,7 @@ class ManageTrackFileSerializer(serializers.ModelSerializer):
class ManageTrackFileActionSerializer(common_serializers.ActionSerializer): class ManageTrackFileActionSerializer(common_serializers.ActionSerializer):
actions = ['delete'] actions = ['delete']
dangerous_actions = ['delete']
filterset_class = filters.ManageTrackFileFilterSet filterset_class = filters.ManageTrackFileFilterSet
@transaction.atomic @transaction.atomic

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

@ -21,7 +21,7 @@
:class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']"> :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']">
{{ $t('Go') }}</div> {{ $t('Go') }}</div>
<dangerous-button <dangerous-button
v-else :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']" v-else-if="!currentAction.isDangerous" :class="['ui', {disabled: checked.length === 0}, {'loading': actionLoading}, 'button']"
confirm-color="green" confirm-color="green"
color="" color=""
@confirm="launchAction"> @confirm="launchAction">
@ -36,7 +36,7 @@
<div class="count field"> <div class="count field">
<span v-if="selectAll">{{ $t('{% count %} on {% total %} selected', {count: objectsData.count, total: objectsData.count}) }}</span> <span v-if="selectAll">{{ $t('{% count %} on {% total %} selected', {count: objectsData.count, total: objectsData.count}) }}</span>
<span v-else>{{ $t('{% count %} on {% total %} selected', {count: checked.length, total: objectsData.count}) }}</span> <span v-else>{{ $t('{% count %} on {% total %} selected', {count: checked.length, total: objectsData.count}) }}</span>
<template v-if="checkable.length === checked.length"> <template v-if="!currentAction.isDangerous && checkable.length === checked.length">
<a @click="selectAll = true" v-if="!selectAll"> <a @click="selectAll = true" v-if="!selectAll">
{{ $t('Select all {% total %} elements', {total: objectsData.count}) }} {{ $t('Select all {% total %} elements', {total: objectsData.count}) }}
</a> </a>

3
front/src/components/manage/library/FilesTable.vue
View File

@ -181,7 +181,8 @@ export default {
return [ return [
{ {
name: 'delete', name: 'delete',
label: this.$t('Delete') label: this.$t('Delete'),
isDangerous: true
} }
] ]
} }