Merge branch '751-moderation-rule-cancel' into 'master'

Fix #751: saving moderation policy when clicking on "Cancel"

See merge request funkwhale/funkwhale!662
This commit is contained in:
Eliot Berriot 2019-03-11 10:55:48 +01:00
commit 41fa4f62cf
2 changed files with 2 additions and 1 deletions

View File

@ -0,0 +1 @@
Fixed saving moderation policy when clicking on "Cancel" (#751)

View File

@ -51,7 +51,7 @@
</div> </div>
</div> </div>
<div class="ui hidden divider"></div> <div class="ui hidden divider"></div>
<button @click="$emit('cancel')" class="ui basic left floated button"> <button @click.prevent="$emit('cancel')" class="ui basic left floated button">
<translate>Cancel</translate> <translate>Cancel</translate>
</button> </button>
<button :class="['ui', 'right', 'floated', 'green', {'disabled loading': isLoading}, 'button']" :disabled="isLoading"> <button :class="['ui', 'right', 'floated', 'green', {'disabled loading': isLoading}, 'button']" :disabled="isLoading">