diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-06-07 22:53:06 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-06-07 22:53:06 +0300 |
commit | b3bb03fed4c4ddef4492c40d79f7dc313b48c201 (patch) | |
tree | f72743a33a734822c97f4fdbacdcad644cae5771 /models | |
parent | 123d9659c155b649e8aa112e474760d3fe3b7301 (diff) | |
parent | 1332a578901ae131f7a2a8fffd566072e5440e46 (diff) | |
download | wekan-b3bb03fed4c4ddef4492c40d79f7dc313b48c201.tar.gz wekan-b3bb03fed4c4ddef4492c40d79f7dc313b48c201.tar.bz2 wekan-b3bb03fed4c4ddef4492c40d79f7dc313b48c201.zip |
Merge branch 'moreFieldsColours' of https://github.com/rjevnikar/wekan into rjevnikar-moreFieldsColours
Diffstat (limited to 'models')
-rw-r--r-- | models/boards.js | 3 | ||||
-rw-r--r-- | models/cards.js | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/models/boards.js b/models/boards.js index 44ce0b62..911d82a1 100644 --- a/models/boards.js +++ b/models/boards.js @@ -94,6 +94,9 @@ Boards.attachSchema(new SimpleSchema({ allowedValues: [ 'green', 'yellow', 'orange', 'red', 'purple', 'blue', 'sky', 'lime', 'pink', 'black', + 'silver', 'peachpuff', 'crimson', 'plum', 'darkgreen', + 'slateblue', 'magenta', 'gold', 'navy', 'gray', + 'saddlebrown', 'paleturquoise', 'mistyrose', 'indigo', ], }, // XXX We might want to maintain more informations under the member sub- diff --git a/models/cards.js b/models/cards.js index 6a33fa1a..9236fcaa 100644 --- a/models/cards.js +++ b/models/cards.js @@ -66,6 +66,14 @@ Cards.attachSchema(new SimpleSchema({ type: String, optional: true, }, + requestedBy: { + type: String, + optional: true, + }, + assignedBy: { + type: String, + optional: true, + }, labelIds: { type: [String], optional: true, @@ -268,6 +276,14 @@ Cards.mutations({ return {$set: {description}}; }, + setRequestedBy(requestedBy) { + return {$set: {requestedBy}}; + }, + + setAssignedBy(assignedBy) { + return {$set: {assignedBy}}; + }, + move(swimlaneId, listId, sortIndex) { const list = Lists.findOne(listId); const mutatedFields = { |