diff options
author | Akuket <32392661+Akuket@users.noreply.github.com> | 2018-10-09 14:49:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-09 14:49:12 +0200 |
commit | 28a01862d04654784bd6010035c3a6fe1690ba60 (patch) | |
tree | ee52d3c84b12f5ada9a3faf12925dd5806385a91 /client/components/rules/rulesMain.js | |
parent | 3b4f285fea4a90ee96bfce855e1539adcec9b7aa (diff) | |
parent | 58855ada97677d25475ba4721834c0f576ed3b47 (diff) | |
download | wekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.gz wekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.bz2 wekan-28a01862d04654784bd6010035c3a6fe1690ba60.zip |
Merge branch 'edge' into edge
Diffstat (limited to 'client/components/rules/rulesMain.js')
-rw-r--r-- | client/components/rules/rulesMain.js | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 65cc3d98..0752a541 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -24,7 +24,7 @@ BlazeComponent.extendComponent({ events() { return [{ - 'click .js-delete-rule' (event) { + 'click .js-delete-rule' () { const rule = this.currentData(); Rules.remove(rule._id); Actions.remove(rule.actionId); @@ -34,9 +34,11 @@ BlazeComponent.extendComponent({ 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; - this.find('#ruleTitle').value = ''; - this.ruleName.set(ruleTitle); - this.setTrigger(); + if(ruleTitle !== undefined && ruleTitle !== ''){ + this.find('#ruleTitle').value = ''; + this.ruleName.set(ruleTitle); + this.setTrigger(); + } }, 'click .js-goto-action' (event) { event.preventDefault(); @@ -46,6 +48,15 @@ BlazeComponent.extendComponent({ event.preventDefault(); this.setRulesList(); }, + 'click .js-goback' (event) { + event.preventDefault(); + if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){ + this.setRulesList(); + } + if(this.rulesCurrentTab.get() === 'action'){ + this.setTrigger(); + } + }, 'click .js-goto-details' (event) { event.preventDefault(); const rule = this.currentData(); |