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

Merge branch '103-radio-button' into 'develop' 

Resolve "Start/stop radio buttons all enabled for user radios"

Closes #103

See merge request funkwhale/funkwhale!95
This commit is contained in:
Eliot Berriot 2018-03-18 17:51:30 +00:00
parent 019354e6dc 5db8c950cc
commit 65d876d95b
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fixed synchronized start/stop radio buttons for all custom radios (#103)

2
front/src/components/Pagination.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<div class="ui pagination borderless menu"> <div class="ui pagination borderless menu">
<a <a
v-if="current - 1 >= 1"
@click="selectPage(current - 1)" @click="selectPage(current - 1)"
:class="[{'disabled': current - 1 < 1}, 'item']"><i class="angle left icon"></i></a> :class="[{'disabled': current - 1 < 1}, 'item']"><i class="angle left icon"></i></a>
<template> <template>
@ -16,6 +17,7 @@
</a> </a>
</template> </template>
<a <a
v-if="current + 1 <= maxPage"
@click="selectPage(current + 1)" @click="selectPage(current + 1)"
:class="[{'disabled': current + 1 > maxPage}, 'item']"><i class="angle right icon"></i></a> :class="[{'disabled': current + 1 > maxPage}, 'item']"><i class="angle right icon"></i></a>
</div> </div>

2
front/src/components/radios/Button.vue
View File

@ -31,7 +31,7 @@ export default {
if (!state.running) { if (!state.running) {
return false return false
} else { } else {
return current.type === this.type & current.objectId === this.objectId return current.type === this.type && current.objectId === this.objectId && current.customRadioId === this.customRadioId
} }
} }
} }