diff options
author | Angelo Gallarello <angelo.gallarell@gmail.com> | 2018-09-14 16:49:06 +0200 |
---|---|---|
committer | Angelo Gallarello <angelo.gallarell@gmail.com> | 2018-09-14 16:49:06 +0200 |
commit | fc73dc5bbcbbd203efc4f10ecb4bd1a66e0d9efb (patch) | |
tree | f1c2af072fb0c80ea031188f53cdf2c9f23efbf4 /client/components/rules/triggers | |
parent | e649c79bb71140a15f8e65fdb98ecb367469c0b7 (diff) | |
download | wekan-fc73dc5bbcbbd203efc4f10ecb4bd1a66e0d9efb.tar.gz wekan-fc73dc5bbcbbd203efc4f10ecb4bd1a66e0d9efb.tar.bz2 wekan-fc73dc5bbcbbd203efc4f10ecb4bd1a66e0d9efb.zip |
Refactoring rules description
Diffstat (limited to 'client/components/rules/triggers')
-rw-r--r-- | client/components/rules/triggers/boardTriggers.jade | 4 | ||||
-rw-r--r-- | client/components/rules/triggers/boardTriggers.js | 25 | ||||
-rw-r--r-- | client/components/rules/triggers/cardTriggers.jade | 2 |
3 files changed, 18 insertions, 13 deletions
diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index dec15d86..b5e08c8c 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -6,7 +6,7 @@ template(name="boardTriggers") div.trigger-dropdown select(id="gen-action") option(value="created") {{{_'r-added-to'}}} - option(value="removed") {{{_'r-added-to'}}} + option(value="removed") {{{_'r-removed-from'}}} div.trigger-text | {{{_'r-the-board'}}} div.trigger-button.js-add-gen-trigger.js-goto-action @@ -19,7 +19,7 @@ template(name="boardTriggers") div.trigger-dropdown select(id="create-action") option(value="created") {{{_'r-added-to'}}} - option(value="removed") {{{_'r-added-to'}}} + option(value="removed") {{{_'r-removed-from'}}} div.trigger-text | {{{_'r-list'}}} div.trigger-dropdown diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js index dcc1c187..067c1df8 100644 --- a/client/components/rules/triggers/boardTriggers.js +++ b/client/components/rules/triggers/boardTriggers.js @@ -6,51 +6,56 @@ BlazeComponent.extendComponent({ events() { return [ {'click .js-add-gen-trigger'(event) { - + const desc = Utils.getTriggerActionDesc(event,this); let datas = this.data(); const actionSelected = this.find('#gen-action').value; const boardId = Session.get('currentBoard') if(actionSelected == "created"){ - datas.triggerVar.set({activityType: "createCard","boardId":boardId,"listName":"*"}); + datas.triggerVar.set({activityType: "createCard","boardId":boardId,"listName":"*","desc":desc}); } if(actionSelected == "removed"){ - datas.triggerVar.set({activityType: "removeCard","boardId":boardId}); + datas.triggerVar.set({activityType: "removeCard","boardId":boardId,"desc":desc}); } + + }, 'click .js-add-create-trigger'(event) { - + const desc = Utils.getTriggerActionDesc(event,this); let datas = this.data(); const actionSelected = this.find('#create-action').value; const listName = this.find('#create-list-name').value; const boardId = Session.get('currentBoard') if(actionSelected == "created"){ - datas.triggerVar.set({activityType: "createCard","boardId":boardId,"listName":listName}); + datas.triggerVar.set({activityType: "createCard","boardId":boardId,"listName":listName,"desc":desc}); } if(actionSelected == "removed"){ - datas.triggerVar.set({activityType: "removeCard","boardId":boardId,"listName":listName}); + datas.triggerVar.set({activityType: "removeCard","boardId":boardId,"listName":listName,"desc":desc}); } }, 'click .js-add-moved-trigger'(event) { let datas = this.data(); + const desc = Utils.getTriggerActionDesc(event,this); + const actionSelected = this.find('#move-action').value; const listName = this.find('#move-list-name').value; const boardId = Session.get('currentBoard') if(actionSelected == "moved-to"){ - datas.triggerVar.set({activityType: "moveCard","boardId":boardId,"listName":listName,"oldListName":"*"}); + datas.triggerVar.set({activityType: "moveCard","boardId":boardId,"listName":listName,"oldListName":"*","desc":desc}); } if(actionSelected == "moved-from"){ - datas.triggerVar.set({activityType: "moveCard","boardId":boardId,"listName":"*","oldListName":listName}); + datas.triggerVar.set({activityType: "moveCard","boardId":boardId,"listName":"*","oldListName":listName,"desc":desc}); } }, 'click .js-add-arc-trigger'(event) { let datas = this.data(); + const desc = Utils.getTriggerActionDesc(event,this); const actionSelected = this.find('#arch-action').value; const boardId = Session.get('currentBoard') if(actionSelected == "archived"){ - datas.triggerVar.set({activityType: "archivedCard","boardId":boardId}); + datas.triggerVar.set({activityType: "archivedCard","boardId":boardId,"desc":desc}); } if(actionSelected == "unarchived"){ - datas.triggerVar.set({activityType: "restoredCard","boardId":boardId}); + datas.triggerVar.set({activityType: "restoredCard","boardId":boardId,"desc":desc}); } } diff --git a/client/components/rules/triggers/cardTriggers.jade b/client/components/rules/triggers/cardTriggers.jade index a459a7e0..dd02413c 100644 --- a/client/components/rules/triggers/cardTriggers.jade +++ b/client/components/rules/triggers/cardTriggers.jade @@ -22,7 +22,7 @@ template(name="cardTriggers") option(value="#{_id}") = name div.trigger-text - | is + | {{{_'r-is'}}} div.trigger-dropdown select(id="spec-label-action") option(value="added") {{{_'r-added-to'}}} |