summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/checklistItems.js17
-rw-r--r--models/users.js8
-rw-r--r--models/wekanCreator.js3
3 files changed, 21 insertions, 7 deletions
diff --git a/models/checklistItems.js b/models/checklistItems.js
index c85c0260..9867dd94 100644
--- a/models/checklistItems.js
+++ b/models/checklistItems.js
@@ -126,7 +126,7 @@ function publishChekListCompleted(userId, doc){
if(checkList.isFinished()){
const act = {
userId,
- activityType: 'checklistCompleted',
+ activityType: 'completeChecklist',
cardId: doc.cardId,
boardId,
checklistId: doc.checklistId,
@@ -141,10 +141,23 @@ function publishChekListUncompleted(userId, doc){
const boardId = card.boardId;
const checklistId = doc.checklistId;
const checkList = Checklists.findOne({_id:checklistId});
+ // BUGS in IFTTT Rules: https://github.com/wekan/wekan/issues/1972
+ // Currently in checklist all are set as uncompleted/not checked,
+ // IFTTT Rule does not move card to other list.
+ // If following line is negated/changed to:
+ // if(!checkList.isFinished()){
+ // then unchecking of any checkbox will move card to other list,
+ // even when all checkboxes are not yet unchecked.
+ // What is correct code for only moving when all in list is unchecked?
+ // TIPS: Finding files, ignoring some directories with grep -v:
+ // cd wekan
+ // find . | xargs grep 'count' -sl | grep -v .meteor | grep -v node_modules | grep -v .build
+ // Maybe something related here?
+ // wekan/client/components/rules/triggers/checklistTriggers.js
if(checkList.isFinished()){
const act = {
userId,
- activityType: 'checklistUncompleted',
+ activityType: 'uncompleteChecklist',
cardId: doc.cardId,
boardId,
checklistId: doc.checklistId,
diff --git a/models/users.js b/models/users.js
index 630f4703..2e879d94 100644
--- a/models/users.js
+++ b/models/users.js
@@ -520,10 +520,10 @@ if (Meteor.isServer) {
}
const disableRegistration = Settings.findOne().disableRegistration;
- // If ldap, bypass the inviation code if the self registration isn't allowed.
- // TODO : pay attention if ldap field in the user model change to another content ex : ldap field to connection_type
- if (options.ldap || !disableRegistration) {
- user.authenticationMethod = 'ldap';
+ if (!disableRegistration) {
+ if (options.ldap) {
+ user.authenticationMethod = 'ldap';
+ }
return user;
}
diff --git a/models/wekanCreator.js b/models/wekanCreator.js
index b179cfae..fa950970 100644
--- a/models/wekanCreator.js
+++ b/models/wekanCreator.js
@@ -749,7 +749,8 @@ export class WekanCreator {
});
}
- check(board) {
+ //check(board) {
+ check() {
//try {
// check(data, {
// membersMapping: Match.Optional(Object),