diff options
| -rw-r--r-- | models/activities.js | 4 | ||||
| -rw-r--r-- | models/cards.js | 6 | ||||
| -rw-r--r-- | models/customFields.js | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/models/activities.js b/models/activities.js index 3ad316a7..feda36e5 100644 --- a/models/activities.js +++ b/models/activities.js @@ -189,7 +189,9 @@ if (Meteor.isServer) { if (activity.customFieldId) { const customField = activity.customField(); params.customField = customField.name; - params.customFieldValue = customField.text; + params.customFieldValue = Activities.findOne({ + customFieldId: customField._id, + }).value; } // Label activity did not work yet, unable to edit labels when tried this. //if (activity.labelId) { diff --git a/models/cards.js b/models/cards.js index b354511d..d92d003c 100644 --- a/models/cards.js +++ b/models/cards.js @@ -1620,9 +1620,9 @@ if (Meteor.isServer) { // With a huge database, this result in a very slow app and high CPU on the mongodb side. // To correct it, add Index to parentId: Cards._collection._ensureIndex({ parentId: 1 }); - /*let notifydays = parseInt(process.env.NOTIFY_DUE_DAYS_BEFORE_AND_AFTER) || 2; // default as 2 days b4 and after - let notifyitvl = parseInt(process.env.NOTIFY_DUE_AT_HOUR_OF_DAY) || 3600 * 24 * 1e3; // default interval as one day - Meteor.call("findDueCards",notifydays,notifyitvl);*/ + // let notifydays = parseInt(process.env.NOTIFY_DUE_DAYS_BEFORE_AND_AFTER) || 2; // default as 2 days b4 and after + // let notifyitvl = parseInt(process.env.NOTIFY_DUE_AT_HOUR_OF_DAY) || 3600 * 24 * 1e3; // default interval as one day + // Meteor.call("findDueCards",notifydays,notifyitvl); Meteor.defer(() => { addCronJob(); }); diff --git a/models/customFields.js b/models/customFields.js index 1ca2fb90..a5eb8906 100644 --- a/models/customFields.js +++ b/models/customFields.js @@ -165,11 +165,15 @@ function customFieldDeletion(userId, doc) { // instead it shows undefined, and no listId and swimlaneId. function customFieldEdit(userId, doc) { const card = Cards.findOne(doc.cardId); + const customFieldValue = Activities.findOne({ customFieldId: doc._id }).value; + const boardId = card.boardId; + //boardId: doc.boardIds[0], // We are creating a customField, it has only one boardId Activities.insert({ userId, - activityType: 'editCustomField', - boardId: doc.boardIds[0], // We are creating a customField, it has only one boardId + activityType: 'setCustomField', + boardId, customFieldId: doc._id, + customFieldValue, listId: card.listId, swimlaneId: card.swimlaneId, }); |