local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix sharing rights not displayed correctly

Browse source
This commit is contained in:
kolaente 2020-05-11 20:56:35 +02:00
parent 687b8dc824
commit cc46809639
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/components/sharing/userTeam.vue
View file

@ -76,7 +76,7 @@
</td> </td>
<td class="actions" v-if="userIsAdmin"> <td class="actions" v-if="userIsAdmin">
<div class="select"> <div class="select">
<select @change="toggleType(s)" v-model="selectedRight" class="button buttonright"> <select @change="toggleType(s)" v-model="selectedRight[s.id]" class="button buttonright">
<option :value="rights.READ" :selected="s.right === rights.READ">Read only</option> <option :value="rights.READ" :selected="s.right === rights.READ">Read only</option>
<option :value="rights.READ_WRITE" :selected="s.right === rights.READ_WRITE">Read & write</option> <option :value="rights.READ_WRITE" :selected="s.right === rights.READ_WRITE">Read & write</option>
<option :value="rights.ADMIN" :selected="s.right === rights.ADMIN">Admin</option> <option :value="rights.ADMIN" :selected="s.right === rights.ADMIN">Admin</option>
@ -154,7 +154,7 @@
found: [], found: [],
searchLabel: '', searchLabel: '',
rights: rights, rights: rights,
selectedRight: rights.READ, selectedRight: {},
typeString: '', typeString: '',
sharables: [], // This holds either teams or users who this namepace or list is shared with sharables: [], // This holds either teams or users who this namepace or list is shared with
@ -213,6 +213,7 @@
this.stuffService.getAll(this.stuffModel) this.stuffService.getAll(this.stuffModel)
.then(r => { .then(r => {
this.$set(this, 'sharables', r) this.$set(this, 'sharables', r)
r.forEach(s => this.$set(this.selectedRight, s.id, s.right))
}) })
.catch(e => { .catch(e => {
this.error(e, this) this.error(e, this)
@ -267,13 +268,13 @@
}) })
}, },
toggleType(sharable) { toggleType(sharable) {
if (this.selectedRight !== rights.ADMIN && if (this.selectedRight[sharable.id] !== rights.ADMIN &&
this.selectedRight !== rights.READ && this.selectedRight[sharable.id] !== rights.READ &&
this.selectedRight !== rights.READ_WRITE this.selectedRight[sharable.id] !== rights.READ_WRITE
) { ) {
this.selectedRight = rights.READ this.selectedRight[sharable.id] = rights.READ
} }
this.stuffModel.right = this.selectedRight this.stuffModel.right = this.selectedRight[sharable.id]
if (this.shareType === 'user') { if (this.shareType === 'user') {
@ -286,7 +287,7 @@
.then(r => { .then(r => {
for (const i in this.sharables) { for (const i in this.sharables) {
if ( if (
(this.sharables[i].id === this.stuffModel.userId && this.shareType === 'user') || (this.sharables[i].username === this.stuffModel.userId && this.shareType === 'user') ||
(this.sharables[i].id === this.stuffModel.teamId && this.shareType === 'team') (this.sharables[i].id === this.stuffModel.teamId && this.shareType === 'team')
) { ) {
this.$set(this.sharables[i], 'right', r.right) this.$set(this.sharables[i], 'right', r.right)