From 37a53e7466107d229a67a4c2efc4b25708bbe93d Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Fri, 21 Sep 2018 14:22:00 +0200 Subject: Fixed some rules --- client/components/rules/triggers/checklistTriggers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/components') diff --git a/client/components/rules/triggers/checklistTriggers.js b/client/components/rules/triggers/checklistTriggers.js index 01f3effe..2272be29 100644 --- a/client/components/rules/triggers/checklistTriggers.js +++ b/client/components/rules/triggers/checklistTriggers.js @@ -78,7 +78,7 @@ BlazeComponent.extendComponent({ const actionSelected = this.find('#spec-comp-check-action').value; const checklistId = this.find('#spec-comp-check-name').value; const boardId = Session.get('currentBoard'); - if (actionSelected === 'added') { + if (actionSelected === 'completed') { datas.triggerVar.set({ activityType: 'completeChecklist', boardId, @@ -86,7 +86,7 @@ BlazeComponent.extendComponent({ desc, }); } - if (actionSelected === 'removed') { + if (actionSelected === 'uncompleted') { datas.triggerVar.set({ activityType: 'uncompleteChecklist', boardId, -- cgit v1.2.3-1-g7c22 From 1f02321e2767a4772a35f512fa29798b6aeadb9a Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Fri, 21 Sep 2018 14:53:04 +0200 Subject: Fixed rules about member and box dropdowns width --- client/components/rules/actions/cardActions.js | 8 ++++---- client/components/rules/rules.styl | 2 +- client/components/rules/triggers/cardTriggers.js | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'client/components') diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js index a65407c1..b04440bd 100644 --- a/client/components/rules/actions/cardActions.js +++ b/client/components/rules/actions/cardActions.js @@ -58,14 +58,14 @@ BlazeComponent.extendComponent({ const ruleName = this.data().ruleName.get(); const trigger = this.data().triggerVar.get(); const actionSelected = this.find('#member-action').value; - const memberName = this.find('#member-name').value; + const username = this.find('#member-name').value; const boardId = Session.get('currentBoard'); const desc = Utils.getTriggerActionDesc(event, this); if (actionSelected === 'add') { const triggerId = Triggers.insert(trigger); const actionId = Actions.insert({ actionType: 'addMember', - memberName, + username, boardId, desc, }); @@ -81,7 +81,7 @@ BlazeComponent.extendComponent({ const triggerId = Triggers.insert(trigger); const actionId = Actions.insert({ actionType: 'removeMember', - memberName, + username, boardId, desc, }); @@ -101,7 +101,7 @@ BlazeComponent.extendComponent({ const boardId = Session.get('currentBoard'); const actionId = Actions.insert({ actionType: 'removeMember', - 'memberName': '*', + 'username': '*', boardId, desc, }); diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl index 68d74d32..45ce4003 100644 --- a/client/components/rules/rules.styl +++ b/client/components/rules/rules.styl @@ -116,7 +116,7 @@ .trigger-dropdown display:inline-block select - width:100px + width:auto height:30px margin:0px margin-left:5px diff --git a/client/components/rules/triggers/cardTriggers.js b/client/components/rules/triggers/cardTriggers.js index 704c7690..2303a85b 100644 --- a/client/components/rules/triggers/cardTriggers.js +++ b/client/components/rules/triggers/cardTriggers.js @@ -67,7 +67,7 @@ BlazeComponent.extendComponent({ datas.triggerVar.set({ activityType: 'joinMember', boardId, - 'memberId': '*', + 'username': '*', desc, }); } @@ -75,7 +75,7 @@ BlazeComponent.extendComponent({ datas.triggerVar.set({ activityType: 'unjoinMember', boardId, - 'memberId': '*', + 'username': '*', desc, }); } @@ -84,13 +84,13 @@ BlazeComponent.extendComponent({ const desc = Utils.getTriggerActionDesc(event, this); const datas = this.data(); const actionSelected = this.find('#spec-member-action').value; - const memberId = this.find('#spec-member').value; + const username = this.find('#spec-member').value; const boardId = Session.get('currentBoard'); if (actionSelected === 'added') { datas.triggerVar.set({ activityType: 'joinMember', boardId, - memberId, + username, desc, }); } @@ -98,7 +98,7 @@ BlazeComponent.extendComponent({ datas.triggerVar.set({ activityType: 'unjoinMember', boardId, - memberId, + username, desc, }); } -- cgit v1.2.3-1-g7c22 From 80e06b8ffc7b9440b9e46ba43200a91c1b617cb0 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Fri, 21 Sep 2018 17:02:43 +0200 Subject: Rules hidden from non admin --- client/components/boards/boardHeader.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'client/components') diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index dfd281de..75b2f02b 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -87,10 +87,10 @@ template(name="boardHeaderBar") if Filter.isActive a.board-header-btn-close.js-filter-reset(title="{{_ 'filter-clear'}}") i.fa.fa-times-thin - - a.board-header-btn.js-open-rules-view(title="{{_ 'rules'}}") - i.fa.fa-magic - span {{_ 'rules'}} + if currentUser.isAdmin + a.board-header-btn.js-open-rules-view(title="{{_ 'rules'}}") + i.fa.fa-magic + span {{_ 'rules'}} a.board-header-btn.js-open-search-view(title="{{_ 'search'}}") i.fa.fa-search -- cgit v1.2.3-1-g7c22 From 620180981050e2db4e2fe69c968c529951a02fdc Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Fri, 21 Sep 2018 17:20:45 +0200 Subject: Added general move trigger --- client/components/rules/triggers/boardTriggers.jade | 7 +++++++ client/components/rules/triggers/boardTriggers.js | 13 +++++++++++++ 2 files changed, 20 insertions(+) (limited to 'client/components') diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index 266f11f8..48b9345c 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -27,6 +27,13 @@ template(name="boardTriggers") div.trigger-button.js-add-create-trigger.js-goto-action i.fa.fa-plus + div.trigger-item + div.trigger-content + div.trigger-text + | {{_'r-when-a-card-is-moved'}} + div.trigger-button.js-add-gen-moved-trigger.js-goto-action + i.fa.fa-plus + div.trigger-item div.trigger-content div.trigger-text diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js index e4753642..562d84a9 100644 --- a/client/components/rules/triggers/boardTriggers.js +++ b/client/components/rules/triggers/boardTriggers.js @@ -76,6 +76,19 @@ BlazeComponent.extendComponent({ }); } }, + 'click .js-add-gen-moved-trigger' (event){ + const datas = this.data(); + const desc = Utils.getTriggerActionDesc(event, this); + const boardId = Session.get('currentBoard'); + + datas.triggerVar.set({ + activityType: 'moveCard', + boardId, + 'listName':'*', + 'oldListName': '*', + desc, + }); + }, 'click .js-add-arc-trigger' (event) { const datas = this.data(); const desc = Utils.getTriggerActionDesc(event, this); -- cgit v1.2.3-1-g7c22 From dba5de18828313711b245792d5c6da81fd60031e Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Fri, 21 Sep 2018 20:19:47 +0200 Subject: Lint fix --- client/components/rules/triggers/boardTriggers.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'client/components') diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js index 562d84a9..40c5b07e 100644 --- a/client/components/rules/triggers/boardTriggers.js +++ b/client/components/rules/triggers/boardTriggers.js @@ -81,13 +81,13 @@ BlazeComponent.extendComponent({ const desc = Utils.getTriggerActionDesc(event, this); const boardId = Session.get('currentBoard'); - datas.triggerVar.set({ - activityType: 'moveCard', - boardId, - 'listName':'*', - 'oldListName': '*', - desc, - }); + datas.triggerVar.set({ + activityType: 'moveCard', + boardId, + 'listName':'*', + 'oldListName': '*', + desc, + }); }, 'click .js-add-arc-trigger' (event) { const datas = this.data(); -- cgit v1.2.3-1-g7c22