summaryrefslogtreecommitdiffstats
path: root/client/components/rules
diff options
context:
space:
mode:
authorAngelo Gallarello <angelo.gallarell@gmail.com>2019-02-12 23:40:12 +0100
committerAngelo Gallarello <angelo.gallarell@gmail.com>2019-02-12 23:40:12 +0100
commit477d71e0b90d15b54945a1a04cb0a649344075ae (patch)
tree3eccde9b00ff3d35b98e960cbb755c177ee14bda /client/components/rules
parentd22964bcfd46ea4fd4860528b0c5e6f5d90812b6 (diff)
downloadwekan-477d71e0b90d15b54945a1a04cb0a649344075ae.tar.gz
wekan-477d71e0b90d15b54945a1a04cb0a649344075ae.tar.bz2
wekan-477d71e0b90d15b54945a1a04cb0a649344075ae.zip
Fixes
Diffstat (limited to 'client/components/rules')
-rw-r--r--client/components/rules/triggers/boardTriggers.jade3
-rw-r--r--client/components/rules/triggers/boardTriggers.js6
2 files changed, 6 insertions, 3 deletions
diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade
index b8c11d69..ff1406f6 100644
--- a/client/components/rules/triggers/boardTriggers.jade
+++ b/client/components/rules/triggers/boardTriggers.jade
@@ -64,8 +64,7 @@ template(name="boardTriggers")
div.trigger-text
| {{_'r-in-swimlane'}}
div.trigger-dropdown
- input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}")
- div.trigger-button.trigger-button-person.js-show-user-field
+ input(id="create-swimlane-name-2",type=text,placeholder="{{_'r-swimlane-name'}}")
div.trigger-button.trigger-button-person.js-show-user-field
i.fa.fa-user
div.user-details.hide-element
diff --git a/client/components/rules/triggers/boardTriggers.js b/client/components/rules/triggers/boardTriggers.js
index d4b9b81c..1dc5c437 100644
--- a/client/components/rules/triggers/boardTriggers.js
+++ b/client/components/rules/triggers/boardTriggers.js
@@ -39,15 +39,18 @@ BlazeComponent.extendComponent({
'click .js-add-moved-trigger' (event) {
const datas = this.data();
const desc = Utils.getTriggerActionDesc(event, this);
- const swimlaneName = this.find('#create-swimlane-name').value;
+ const swimlaneName = this.find('#create-swimlane-name-2').value;
const actionSelected = this.find('#move-action').value;
const listName = this.find('#move-list-name').value;
const boardId = Session.get('currentBoard');
+ const divId = $(event.currentTarget.parentNode).attr('id');
+ const cardTitle = this.cardTitleFilters[divId];
if (actionSelected === 'moved-to') {
datas.triggerVar.set({
activityType: 'moveCard',
boardId,
listName,
+ cardTitle,
swimlaneName,
'oldListName': '*',
desc,
@@ -57,6 +60,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'moveCard',
boardId,
+ cardTitle,
swimlaneName,
'listName': '*',
'oldListName': listName,