Skip to content

[stable31] fix: board & label color picker #7465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luka-nextcloud merged 1 commit into from
Dec 18, 2025
Merged

[stable31] fix: board & label color picker #7465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/components/board/TagsTabSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<!-- Edit Tag -->
<template v-if="editingLabelId === label.id">
<form class="label-form" @submit.prevent="updateLabel(label)">
<NcColorPicker class="color-picker-wrapper"
:value="'#' + editingLabel.color"
<NcColorPicker v-model="editingLabelColor"
class="color-picker-wrapper"
:advanced-fields="true"
@input="updateColor">
<div :style="{ backgroundColor: '#' + editingLabel.color }" class="color0 icon-colorpicker" />
@submit="updateColor">
<div :style="{ backgroundColor: editingLabelColor }" class="color0 icon-colorpicker" />
</NcColorPicker>
<input v-model="editingLabel.title" type="text">
<input :disabled="!editLabelObjValidated"
Expand Down Expand Up @@ -56,11 +56,11 @@
<li v-if="addLabel" class="editing">
<!-- New Tag -->
<form class="label-form" @submit.prevent="clickAddLabel">
<NcColorPicker class="color-picker-wrapper"
:value="'#' + addLabelObj.color"
<NcColorPicker v-model="addLabelColor"
class="color-picker-wrapper"
:advanced-fields="true"
@input="updateColor">
<div :style="{ backgroundColor: '#' + addLabelObj.color }" class="color0 icon-colorpicker" />
<div :style="{ backgroundColor: addLabelColor }" class="color0 icon-colorpicker" />
</NcColorPicker>
<input v-model="addLabelObj.title" type="text">
<input :disabled="!addLabelObjValidated"
Expand Down Expand Up @@ -102,8 +102,10 @@ export default {
return {
editingLabelId: null,
editingLabel: null,
editingLabelColor: null,
addLabelObj: null,
addLabel: false,
addLabelColor: null,
missingDataLabel: t('deck', 'title and color value must be provided'),
defaultColors: ['31CC7C', '17CCC', 'FF7A66', 'F1DB50', '7C31CC', 'CC317C', '3A3B3D', 'CACBCD'],
}
Expand Down Expand Up @@ -152,6 +154,7 @@ export default {
clickEdit(label) {
this.editingLabelId = label.id
this.editingLabel = Object.assign({}, label)
this.editingLabelColor = '#' + label.color
},
deleteLabel(id) {
this.$store.dispatch('removeLabelFromCurrentBoard', id)
Expand All @@ -162,12 +165,14 @@ export default {
},
clickShowAddLabel() {
this.addLabelObj = { cardId: null, color: this.defaultColors[Math.floor(Math.random() * this.defaultColors.length)], title: '' }
this.addLabelColor = '#' + this.addLabelObj.color
this.addLabel = true
},
clickAddLabel() {
this.$store.dispatch('addLabelToCurrentBoard', this.addLabelObj)
this.addLabel = false
this.addLabelObj = null
this.addLabelColor = null
},
},
}
Expand Down
5 changes: 1 addition & 4 deletions src/components/navigation/AppNavigationBoard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</template>
</NcAppNavigationItem>
<div v-else-if="editing" class="board-edit">
<NcColorPicker class="app-navigation-entry-bullet-wrapper" :value="`#${board.color}`" @input="updateColor">
<NcColorPicker v-model="editColor" class="app-navigation-entry-bullet-wrapper">
<div :style="{ backgroundColor: getColor }" class="color0 icon-colorpicker app-navigation-entry-bullet" />
</NcColorPicker>
<form @submit.prevent.stop="applyEdit">
Expand Down Expand Up @@ -262,9 +262,6 @@ export default {
this.deleted = false
})
},
updateColor(newColor) {
this.editColor = newColor
},
actionEdit() {
this.editTitle = this.board.title
this.editColor = '#' + this.board.color
Expand Down
Loading