github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Angtrim-feature-rules' into edge

Browse source
This commit is contained in:
Lauri Ojansivu 2018-09-22 10:41:18 +03:00
commit dce63842bb
57 changed files with 198 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/components/boards/boardHeader.jade
View file

@ -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

8
client/components/rules/actions/cardActions.js
View file

@ -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,
});

2
client/components/rules/rules.styl
View file

@ -116,7 +116,7 @@
.trigger-dropdown
display:inline-block
select
width:100px
width:auto
height:30px
margin:0px
margin-left:5px

7
client/components/rules/triggers/boardTriggers.jade
View file

@ -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

13
client/components/rules/triggers/boardTriggers.js
View file

@ -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);

10
client/components/rules/triggers/cardTriggers.js
View file

@ -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,
});
}

4
client/components/rules/triggers/checklistTriggers.js
View file

@ -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,

5
i18n/ar.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/bg.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/br.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/ca.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/cs.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Přidat checklist",
"r-d-remove-checklist": "Odstranit checklist"
"r-d-remove-checklist": "Odstranit checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/de.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": " Wenn das Label ist",
"r-list-name": "Listennamen",
"r-when-a-member": "Wenn ein Mitglied ist",
"r-when-the-member": "Wenn das Mitglied ist",
"r-when-the-member": "Wenn das Mitglied",
"r-name": "Name",
"r-is": "ist",
"r-when-a-attach": "Wenn ein Anhang",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Element demarkieren",
"r-d-check-of-list": "der Checkliste",
"r-d-add-checklist": "Checkliste hinzufügen",
"r-d-remove-checklist": "Checkliste entfernen"
"r-d-remove-checklist": "Checkliste entfernen",
"r-when-a-card-is-moved": "Wenn eine Karte in eine andere Liste verschoben wird"
}

5
i18n/el.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/en-GB.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/en.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -606,5 +606,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/eo.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/es-AR.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/es.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/eu.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/fa.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/fi.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "Kun tunniste on",
"r-list-name": "Listan nimi",
"r-when-a-member": "Kun jäsen on",
"r-when-the-member": "Kun jäsen on",
"r-when-the-member": "Kun käyttäjä",
"r-name": "nimi",
"r-is": "on",
"r-when-a-attach": "Kun liitetiedosto",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Poista ruksi kohdasta",
"r-d-check-of-list": "tarkistuslistasta",
"r-d-add-checklist": "Lisää tarkistuslista",
"r-d-remove-checklist": "Poista tarkistuslista"
"r-d-remove-checklist": "Poista tarkistuslista",
"r-when-a-card-is-moved": "Kun kortti on siirretty toiseen listaan"
}

5
i18n/fr.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "Quand l'étiquette est",
"r-list-name": "Nom de la liste",
"r-when-a-member": "Quand un membre est",
"r-when-the-member": "Quand le membre est",
"r-when-the-member": "When the member",
"r-name": "nom",
"r-is": "est",
"r-when-a-attach": "Quand une pièce jointe",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Décocher l'élément",
"r-d-check-of-list": "de la checklist",
"r-d-add-checklist": "Ajouter une checklist",
"r-d-remove-checklist": "Supprimer la checklist"
"r-d-remove-checklist": "Supprimer la checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/gl.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/he.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "כאשר התווית היא",
"r-list-name": "שם הרשימה",
"r-when-a-member": "כאשר חבר הוא",
"r-when-the-member": "כאשר החבר הוא",
"r-when-the-member": "When the member",
"r-name": "שם",
"r-is": "הוא",
"r-when-a-attach": "כאשר קובץ מצורף",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "ביטול סימון פריט",
"r-d-check-of-list": "של רשימת משימות",
"r-d-add-checklist": "הוספת רשימת משימות",
"r-d-remove-checklist": "הסרת רשימת משימות"
"r-d-remove-checklist": "הסרת רשימת משימות",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/hu.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/hy.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/id.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/ig.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/it.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/ja.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/ka.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/km.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/ko.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/lv.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/mn.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/nb.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/nl.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/pl.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "Gdy etykieta jest",
"r-list-name": "Nazwa listy",
"r-when-a-member": "Gdy członek jest",
"r-when-the-member": "Gdy członek jest",
"r-when-the-member": "When the member",
"r-name": "nazwa",
"r-is": "jest",
"r-when-a-attach": "Gdy załącznik",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Odznacz element",
"r-d-check-of-list": "z listy zadań",
"r-d-add-checklist": "Dodaj listę zadań",
"r-d-remove-checklist": "Usuń listę zadań"
"r-d-remove-checklist": "Usuń listę zadań",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/pt-BR.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/pt.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/ro.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/ru.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/sr.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/sv.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/ta.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/th.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/tr.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/uk.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/vi.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/zh-CN.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

5
i18n/zh-TW.i18n.json
View file

@ -548,7 +548,7 @@
"r-when-the-label-is": "When the label is",
"r-list-name": "List name",
"r-when-a-member": "When a member is",
"r-when-the-member": "When the member is",
"r-when-the-member": "When the member",
"r-name": "name",
"r-is": "is",
"r-when-a-attach": "When an attachment",
@ -605,5 +605,6 @@
"r-d-uncheck-one": "Uncheck item",
"r-d-check-of-list": "of checklist",
"r-d-add-checklist": "Add checklist",
"r-d-remove-checklist": "Remove checklist"
"r-d-remove-checklist": "Remove checklist",
"r-when-a-card-is-moved": "When a card is moved to another list"
}

6
models/cards.js
View file

@ -1165,10 +1165,11 @@ function cardMembers(userId, doc, fieldNames, modifier) {
// Say hello to the new member
if (modifier.$addToSet && modifier.$addToSet.members) {
memberId = modifier.$addToSet.members;
const username = Users.findOne(memberId).username;
if (!_.contains(doc.members, memberId)) {
Activities.insert({
userId,
memberId,
username,
activityType: 'joinMember',
boardId: doc.boardId,
cardId: doc._id,
@ -1179,11 +1180,12 @@ function cardMembers(userId, doc, fieldNames, modifier) {
// Say goodbye to the former member
if (modifier.$pull && modifier.$pull.members) {
memberId = modifier.$pull.members;
const username = Users.findOne(memberId).username;
// Check that the former member is member of the card
if (_.contains(doc.members, memberId)) {
Activities.insert({
userId,
memberId,
username,
activityType: 'unjoinMember',
boardId: doc.boardId,
cardId: doc._id,

4
models/checklistItems.js
View file

@ -130,7 +130,7 @@ function publishChekListCompleted(userId, doc, fieldNames, modifier){
cardId: doc.cardId,
boardId,
checklistId: doc.checklistId,
checklistName:doc.title,
checklistName:checkList.title,
};
Activities.insert(act);
}
@ -148,7 +148,7 @@ function publishChekListUncompleted(userId, doc, fieldNames, modifier){
cardId: doc.cardId,
boardId,
checklistId: doc.checklistId,
checklistName:doc.title,
checklistName:checkList.title,
};
Activities.insert(act);
}

11
models/lists.js
View file

@ -76,6 +76,17 @@ Lists.allow({
Lists.helpers({
cards(swimlaneId) {
const selector = {
listId: this._id,
archived: false,
};
if (swimlaneId)
selector.swimlaneId = swimlaneId;
return Cards.find(Filter.mongoSelector(selector),
{ sort: ['sort'] });
},
cardsUnfiltered(swimlaneId) {
const selector = {
listId: this._id,
archived: false,

16
server/rulesHelper.js
View file

@ -36,27 +36,27 @@ RulesHelper = {
if(action.actionType === 'moveCardToTop'){
let listId;
let list;
if(activity.listTitle === '*'){
listId = card.swimlaneId;
if(action.listTitle === '*'){
listId = card.listId;
list = card.list();
}else{
list = Lists.findOne({title: action.listTitle, boardId });
listId = list._id;
}
const minOrder = _.min(list.cards(card.swimlaneId).map((c) => c.sort));
const minOrder = _.min(list.cardsUnfiltered(card.swimlaneId).map((c) => c.sort));
card.move(card.swimlaneId, listId, minOrder - 1);
}
if(action.actionType === 'moveCardToBottom'){
let listId;
let list;
if(activity.listTitle === '*'){
listId = card.swimlaneId;
if(action.listTitle === '*'){
listId = card.listId;
list = card.list();
}else{
list = Lists.findOne({title: action.listTitle, boardId});
listId = list._id;
}
const maxOrder = _.max(list.cards(card.swimlaneId).map((c) => c.sort));
const maxOrder = _.max(list.cardsUnfiltered(card.swimlaneId).map((c) => c.sort));
card.move(card.swimlaneId, listId, maxOrder + 1);
}
if(action.actionType === 'sendEmail'){
@ -87,7 +87,7 @@ RulesHelper = {
card.removeLabel(action.labelId);
}
if(action.actionType === 'addMember'){
const memberId = Users.findOne({username:action.memberName})._id;
const memberId = Users.findOne({username:action.username})._id;
card.assignMember(memberId);
}
if(action.actionType === 'removeMember'){
@ -97,7 +97,7 @@ RulesHelper = {
card.unassignMember(members[i]);
}
}else{
const memberId = Users.findOne({username:action.memberName})._id;
const memberId = Users.findOne({username:action.username})._id;
card.unassignMember(memberId);
}
}

4
server/triggersDef.js
View file

@ -12,10 +12,10 @@ TriggersDef = {
matchingFields: ['boardId'],
},
joinMember:{
matchingFields: ['boardId', 'memberId'],
matchingFields: ['boardId', 'username'],
},
unjoinMember:{
matchingFields: ['boardId', 'memberId'],
matchingFields: ['boardId', 'username'],
},
addChecklist:{
matchingFields: ['boardId', 'checklistName'],