From afd87e3caa1fedbe8fe5dbaefa485fee1ed85c71 Mon Sep 17 00:00:00 2001
From: Pouyan Savoli <papoola@hotmail.com>
Date: Sun, 27 Aug 2017 22:31:24 +0200
Subject: many custom fields model and UI enhancements

---
 models/boards.js       |  4 ++++
 models/customFields.js | 21 +++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'models')

diff --git a/models/boards.js b/models/boards.js
index 8a7844e2..98c0e46d 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -235,6 +235,10 @@ Boards.helpers({
     return `board-color-${this.color}`;
   },
 
+  customFields() {
+    return CustomFields.find({ boardId: this._id }, { sort: { name: 1 } });
+  },
+
   // XXX currently mutations return no value so we have an issue when using addLabel in import
   // XXX waiting on https://github.com/mquandalle/meteor-collection-mutations/issues/1 to remove...
   pushLabel(name, color) {
diff --git a/models/customFields.js b/models/customFields.js
index 75ee55e8..5e76db35 100644
--- a/models/customFields.js
+++ b/models/customFields.js
@@ -25,7 +25,7 @@ CustomFields.allow({
   remove(userId, doc) {
     return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
   },
-  fetch: ['boardId'],
+  fetch: ['userId', 'boardId'],
 });
 
 // not sure if we need this?
@@ -41,21 +41,18 @@ function customFieldCreation(userId, doc){
 }
 
 if (Meteor.isServer) {
-  // Comments are often fetched within a card, so we create an index to make these
-  // queries more efficient.
-  Meteor.startup(() => {
-    CardComments._collection._ensureIndex({ cardId: 1, createdAt: -1 });
-  });
+  /*Meteor.startup(() => {
+    CustomFields._collection._ensureIndex({ boardId: 1});
+  });*/
 
   CustomFields.after.insert((userId, doc) => {
     customFieldCreation(userId, doc);
   });
 
   CustomFields.after.remove((userId, doc) => {
-    const activity = Activities.findOne({ customFieldId: doc._id });
-    if (activity) {
-      Activities.remove(activity._id);
-    }
+    Activities.remove({
+      customFieldId: doc._id,
+    });
   });
 }
 
@@ -70,7 +67,7 @@ if (Meteor.isServer) {
     });
   });
 
-  JsonRoutes.add('GET', '/api/boards/:boardId/comments/:customFieldId', function (req, res, next) {
+  JsonRoutes.add('GET', '/api/boards/:boardId/custom-fields/:customFieldId', function (req, res, next) {
     Authentication.checkUserId( req.userId);
     const paramBoardId = req.params.boardId;
     const paramCustomFieldId = req.params.customFieldId;
@@ -90,7 +87,7 @@ if (Meteor.isServer) {
       boardId: paramBoardId,
     });
 
-    const customField = CustomFields.findOne({_id: id, cardId:paramCardId, boardId: paramBoardId });
+    const customField = CustomFields.findOne({_id: id, boardId: paramBoardId });
     customFieldCreation(req.body.authorId, customField);
 
     JsonRoutes.sendResult(res, {
-- 
cgit v1.2.3-1-g7c22