From 9d1d66b0f5253c571f07c0f7c6250f5a725ddbb1 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sat, 29 Dec 2018 16:59:50 +0100 Subject: Added triggers by username --- client/components/rules/rulesMain.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'client/components/rules/rulesMain.js') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 0752a541..566fd3e5 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -42,7 +42,26 @@ BlazeComponent.extendComponent({ }, 'click .js-goto-action' (event) { event.preventDefault(); + // Add user to the trigger + const username = $(event.currentTarget.offsetParent).find(".user-name").val(); + let trigger = this.triggerVar.get(); + const user = Users.findOne({"username":username}); + if(user != undefined){ + trigger["userId"] = user._id; + }else{ + trigger["userId"] = "*"; + } + this.triggerVar.set(trigger); this.setAction(); + }, + 'click .js-show-user-field' (event) { + event.preventDefault(); + console.log(event); + console.log(event.currentTarget.offsetParent); + console.log($(event.currentTarget.offsetParent)); + $(event.currentTarget.offsetParent).find(".user-details").removeClass("hide-element"); + + }, 'click .js-goto-rules' (event) { event.preventDefault(); -- cgit v1.2.3-1-g7c22 From 196fef3a1bca7d2d4fbb07e6134c1de2a4338a97 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Mon, 31 Dec 2018 00:45:11 +0100 Subject: Added popup --- client/components/rules/rulesMain.js | 1 + 1 file changed, 1 insertion(+) (limited to 'client/components/rules/rulesMain.js') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 566fd3e5..373c7502 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -31,6 +31,7 @@ BlazeComponent.extendComponent({ Triggers.remove(rule.triggerId); }, + 'click .js-open-card-title-popup': Popup.open('boardCardTitle'), 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; -- cgit v1.2.3-1-g7c22 From 25968a35cc568e1c3f7d084632f4d2c8b41ed380 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Wed, 2 Jan 2019 14:45:45 +0100 Subject: Finished triggers improvements --- client/components/rules/rulesMain.js | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'client/components/rules/rulesMain.js') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 373c7502..42116790 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -1,4 +1,4 @@ -BlazeComponent.extendComponent({ +let rulesMainComponent = BlazeComponent.extendComponent({ onCreated() { this.rulesCurrentTab = new ReactiveVar('rulesList'); this.ruleName = new ReactiveVar(''); @@ -9,7 +9,13 @@ BlazeComponent.extendComponent({ setTrigger() { this.rulesCurrentTab.set('trigger'); }, - + sanitizeObject(obj){ + Object.keys(obj).forEach(key =>{ + if(obj[key] == "" || obj[key] == undefined){ + obj[key] = "*"; + }} + ); + }, setRulesList() { this.rulesCurrentTab.set('rulesList'); }, @@ -31,7 +37,6 @@ BlazeComponent.extendComponent({ Triggers.remove(rule.triggerId); }, - 'click .js-open-card-title-popup': Popup.open('boardCardTitle'), 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; @@ -46,23 +51,23 @@ BlazeComponent.extendComponent({ // Add user to the trigger const username = $(event.currentTarget.offsetParent).find(".user-name").val(); let trigger = this.triggerVar.get(); - const user = Users.findOne({"username":username}); - if(user != undefined){ - trigger["userId"] = user._id; - }else{ - trigger["userId"] = "*"; + trigger["userId"] = "*"; + if(username != undefined ){ + const userFound = Users.findOne({"username":username}); + if(userFound != undefined){ + trigger["userId"] = userFound._id; + this.triggerVar.set(trigger); + } } + // Sanitize trigger + trigger = this.triggerVar.get(); + this.sanitizeObject(trigger) this.triggerVar.set(trigger); this.setAction(); }, 'click .js-show-user-field' (event) { event.preventDefault(); - console.log(event); - console.log(event.currentTarget.offsetParent); - console.log($(event.currentTarget.offsetParent)); $(event.currentTarget.offsetParent).find(".user-details").removeClass("hide-element"); - - }, 'click .js-goto-rules' (event) { event.preventDefault(); @@ -88,3 +93,6 @@ BlazeComponent.extendComponent({ }, }).register('rulesMain'); + + + -- cgit v1.2.3-1-g7c22 From 4d8b2029d266843dc0eb376a0bf752c46e440a13 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Wed, 2 Jan 2019 22:51:00 +0100 Subject: Fixed errors --- client/components/rules/rulesMain.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'client/components/rules/rulesMain.js') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 42116790..2e125960 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -1,4 +1,4 @@ -let rulesMainComponent = BlazeComponent.extendComponent({ +const rulesMainComponent = BlazeComponent.extendComponent({ onCreated() { this.rulesCurrentTab = new ReactiveVar('rulesList'); this.ruleName = new ReactiveVar(''); @@ -10,9 +10,9 @@ let rulesMainComponent = BlazeComponent.extendComponent({ this.rulesCurrentTab.set('trigger'); }, sanitizeObject(obj){ - Object.keys(obj).forEach(key =>{ - if(obj[key] == "" || obj[key] == undefined){ - obj[key] = "*"; + Object.keys(obj).forEach((key) => { + if(obj[key] == '' || obj[key] == undefined){ + obj[key] = '*'; }} ); }, @@ -49,25 +49,25 @@ let rulesMainComponent = BlazeComponent.extendComponent({ 'click .js-goto-action' (event) { event.preventDefault(); // Add user to the trigger - const username = $(event.currentTarget.offsetParent).find(".user-name").val(); + const username = $(event.currentTarget.offsetParent).find('.user-name').val(); let trigger = this.triggerVar.get(); - trigger["userId"] = "*"; + trigger.userId = '*'; if(username != undefined ){ - const userFound = Users.findOne({"username":username}); + const userFound = Users.findOne({username}); if(userFound != undefined){ - trigger["userId"] = userFound._id; + trigger.userId = userFound._id; this.triggerVar.set(trigger); } } // Sanitize trigger trigger = this.triggerVar.get(); - this.sanitizeObject(trigger) + this.sanitizeObject(trigger); this.triggerVar.set(trigger); this.setAction(); }, 'click .js-show-user-field' (event) { event.preventDefault(); - $(event.currentTarget.offsetParent).find(".user-details").removeClass("hide-element"); + $(event.currentTarget.offsetParent).find('.user-details').removeClass('hide-element'); }, 'click .js-goto-rules' (event) { event.preventDefault(); @@ -95,4 +95,3 @@ let rulesMainComponent = BlazeComponent.extendComponent({ }).register('rulesMain'); - -- cgit v1.2.3-1-g7c22