Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-22 10:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

card model and card ui preparation for custom fields #2

Browse source
This commit is contained in:
Pouyan Savoli 2017-08-30 03:23:57 +02:00
parent d87191f17e
commit 733b14dcd8
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/components/cards/cardDetails.styl
View file

@ -71,16 +71,17 @@
.card-details-items .card-details-items
display: flex display: flex
flex-wrap: wrap flex-wrap: wrap
margin: 15px 0 margin: 0 0 15px
.card-details-item .card-details-item
margin-right: 0.5em margin: 15px 0.5em 0 0
&:last-child &:last-child
margin-right: 0 margin-right: 0
&.card-details-item-labels, &.card-details-item-labels,
&.card-details-item-members, &.card-details-item-members,
&.card-details-item-start, &.card-details-item-start,
&.card-details-item-due &.card-details-item-due,
&.card-details-item-customfield
max-width: 50% max-width: 50%
flex-grow: 1 flex-grow: 1

8
models/cards.js
View file

@ -186,6 +186,10 @@ Cards.helpers({
return this.checklistItemCount() !== 0; return this.checklistItemCount() !== 0;
}, },
customFieldIndex(customFieldId) {
return _.pluck(this.customFields, '_id').indexOf(customFieldId);
},
absoluteUrl() { absoluteUrl() {
const board = this.board(); const board = this.board();
return FlowRouter.url('card', { return FlowRouter.url('card', {
@ -255,7 +259,7 @@ Cards.mutations({
assignCustomField(customFieldId) { assignCustomField(customFieldId) {
console.log("assignCustomField", customFieldId); console.log("assignCustomField", customFieldId);
return {$push: {customFields: {_id: customFieldId, value: null}}}; return {$addToSet: {customFields: {_id: customFieldId, value: null}}};
}, },
unassignCustomField(customFieldId) { unassignCustomField(customFieldId) {
@ -264,7 +268,7 @@ Cards.mutations({
}, },
toggleCustomField(customFieldId) { toggleCustomField(customFieldId) {
if (this.customFields && this.customFields[customFieldId]) { if (this.customFields && this.customFieldIndex(customFieldId) > -1) {
return this.unassignCustomField(customFieldId); return this.unassignCustomField(customFieldId);
} else { } else {
return this.assignCustomField(customFieldId); return this.assignCustomField(customFieldId);