jonastheis/frontend
1
0
Fork 0
forked from vikunja/frontend
Code Issues Pull Requests Releases Wiki Activity

Fixed label edit still opening when deleting a label

Browse Source
This commit is contained in:
kolaente 2019-10-26 14:39:27 +02:00
parent 1f504b1e6d
commit 7a997b52a6
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/labels/ListLabels.vue
View File

@ -7,11 +7,10 @@
</p> </p>
<div class="columns"> <div class="columns">
<div class="labels-list column"> <div class="labels-list column">
<a <span
v-for="l in labels" :key="l.id" v-for="l in labels" :key="l.id"
class="tag" class="tag"
:class="{'disabled': user.infos.id !== l.created_by.id}" :class="{'disabled': user.infos.id !== l.created_by.id}"
@click="editLabel(l)"
:style="{'background': l.hex_color, 'color': l.textColor}" :style="{'background': l.hex_color, 'color': l.textColor}"
> >
<span <span
@ -19,10 +18,15 @@
v-tooltip.bottom="'You are not allowed to edit this label because you dont own it.'"> v-tooltip.bottom="'You are not allowed to edit this label because you dont own it.'">
{{ l.title }} {{ l.title }}
</span> </span>
<span v-else>{{ l.title }}</span> <a
@click="editLabel(l)"
:style="{'color': l.textColor}"
v-else>
{{ l.title }}
</a>
<a class="delete is-small" @click="deleteLabel(l)" v-if="user.infos.id === l.created_by.id"></a> <a class="delete is-small" @click="deleteLabel(l)" v-if="user.infos.id === l.created_by.id"></a>
</a> </span>
</div> </div>
<div class="column is-4" v-if="isLabelEdit"> <div class="column is-4" v-if="isLabelEdit">
<div class="card"> <div class="card">

5
src/styles/labels.scss
View File

@ -9,7 +9,10 @@
&.disabled{ &.disabled{
opacity: 0.7; opacity: 0.7;
cursor: default;
&, a {
cursor: default;
}
} }
} }
} }