diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-04-06 08:46:40 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-04-06 08:46:40 +0300 |
| commit | 56cccc678107a94d4cadb13f3b6138cef93a18b0 (patch) | |
| tree | c3bef1326c7d328506e3bc38e6223fbf3f205c25 /client/components/rules/triggers | |
| parent | b680bb53725103f186ac1c7cb604fbd4a5773051 (diff) | |
| parent | 48216e16537d50a27579c545c93624c0302a5a78 (diff) | |
| download | wekan-56cccc678107a94d4cadb13f3b6138cef93a18b0.tar.gz wekan-56cccc678107a94d4cadb13f3b6138cef93a18b0.tar.bz2 wekan-56cccc678107a94d4cadb13f3b6138cef93a18b0.zip | |
Merge remote-tracking branch 'Angtrim/feature-duplicate' into edge
Diffstat (limited to 'client/components/rules/triggers')
| -rw-r--r-- | client/components/rules/triggers/boardTriggers.jade | 3 | ||||
| -rw-r--r-- | client/components/rules/triggers/boardTriggers.js | 6 |
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, |