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

Fixed some rules

Browse source
This commit is contained in:
Angelo Gallarello 2018-09-21 14:22:00 +02:00
parent 254c7fe951
commit 37a53e7466
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/rules/triggers/checklistTriggers.js
View file

@ -78,7 +78,7 @@ BlazeComponent.extendComponent({
const actionSelected = this.find('#spec-comp-check-action').value; const actionSelected = this.find('#spec-comp-check-action').value;
const checklistId = this.find('#spec-comp-check-name').value; const checklistId = this.find('#spec-comp-check-name').value;
const boardId = Session.get('currentBoard'); const boardId = Session.get('currentBoard');
if (actionSelected === 'added') { if (actionSelected === 'completed') {
datas.triggerVar.set({ datas.triggerVar.set({
activityType: 'completeChecklist', activityType: 'completeChecklist',
boardId, boardId,
@ -86,7 +86,7 @@ BlazeComponent.extendComponent({
desc, desc,
}); });
} }
if (actionSelected === 'removed') { if (actionSelected === 'uncompleted') {
datas.triggerVar.set({ datas.triggerVar.set({
activityType: 'uncompleteChecklist', activityType: 'uncompleteChecklist',
boardId, boardId,

4
models/checklistItems.js
View file

@ -130,7 +130,7 @@ function publishChekListCompleted(userId, doc, fieldNames, modifier){
cardId: doc.cardId, cardId: doc.cardId,
boardId, boardId,
checklistId: doc.checklistId, checklistId: doc.checklistId,
checklistName:doc.title, checklistName:checkList.title,
}; };
Activities.insert(act); Activities.insert(act);
} }
@ -148,7 +148,7 @@ function publishChekListUncompleted(userId, doc, fieldNames, modifier){
cardId: doc.cardId, cardId: doc.cardId,
boardId, boardId,
checklistId: doc.checklistId, checklistId: doc.checklistId,
checklistName:doc.title, checklistName:checkList.title,
}; };
Activities.insert(act); Activities.insert(act);
} }

8
server/rulesHelper.js
View file

@ -36,8 +36,8 @@ RulesHelper = {
if(action.actionType === 'moveCardToTop'){ if(action.actionType === 'moveCardToTop'){
let listId; let listId;
let list; let list;
if(activity.listTitle === '*'){ if(action.listTitle === '*'){
listId = card.swimlaneId; listId = card.listId;
list = card.list(); list = card.list();
}else{ }else{
list = Lists.findOne({title: action.listTitle, boardId }); list = Lists.findOne({title: action.listTitle, boardId });
@ -49,8 +49,8 @@ RulesHelper = {
if(action.actionType === 'moveCardToBottom'){ if(action.actionType === 'moveCardToBottom'){
let listId; let listId;
let list; let list;
if(activity.listTitle === '*'){ if(action.listTitle === '*'){
listId = card.swimlaneId; listId = card.listId;
list = card.list(); list = card.list();
}else{ }else{
list = Lists.findOne({title: action.listTitle, boardId}); list = Lists.findOne({title: action.listTitle, boardId});