Merge branch 'devel'

3 files changed, 42 insertions, 2 deletions

diff --git a/models/accountSettings.js b/models/accountSettings.js
index db4087c0..6dfbac5d 100644
--- a/models/accountSettings.js
+++ b/models/accountSettings.js
@@ -23,11 +23,17 @@ AccountSettings.allow({
 
 if (Meteor.isServer) {
   Meteor.startup(() => {
-    AccountSettings.upsert({ _id: 'accounts-allowEmailChange' }, {
+    AccountSettings.upsert({_id: 'accounts-allowEmailChange'}, {
       $setOnInsert: {
         booleanValue: false,
         sort: 0,
       },
     });
+    AccountSettings.upsert({_id: 'accounts-allowUserNameChange'}, {
+      $setOnInsert: {
+        booleanValue: false,
+        sort: 1,
+      },
+    });
   });
 }
diff --git a/models/boards.js b/models/boards.js
index 3e05b499..c863c5ce 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -719,4 +719,33 @@ if (Meteor.isServer) {
       });
     }
   });
+
+  JsonRoutes.add('PUT', '/api/boards/:id/labels', function (req, res) {
+    Authentication.checkUserId(req.userId);
+    const id = req.params.id;
+    try {
+      if (req.body.hasOwnProperty('label')) {
+        const board = Boards.findOne({ _id: id });
+        const color = req.body.label.color;
+        const name = req.body.label.name;
+        const labelId = Random.id(6);
+        if (!board.getLabel(name, color)) {
+          Boards.direct.update({ _id: id }, { $push: { labels: { _id: labelId,  name,  color } } });
+          JsonRoutes.sendResult(res, {
+            code: 200,
+            data: labelId,
+          });
+        } else {
+          JsonRoutes.sendResult(res, {
+            code: 200,
+          });
+        }
+      }
+    }
+    catch (error) {
+      JsonRoutes.sendResult(res, {
+        data: error,
+      });
+    }
+  });
 }
diff --git a/models/cards.js b/models/cards.js
index 721e1ee7..01f79847 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -499,7 +499,7 @@ if (Meteor.isServer) {
         userId: req.body.authorId,
         swimlaneId: req.body.swimlaneId,
         sort: 0,
-        members: members,
+        members,
       });
       JsonRoutes.sendResult(res, {
         code: 200,
@@ -543,6 +543,11 @@ if (Meteor.isServer) {
       Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
         {$set: {description: newDescription}});
     }
+    if (req.body.hasOwnProperty('labelIds')) {
+      const newlabelIds = req.body.labelIds;
+      Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false},
+        {$set: {labelIds: newlabelIds}});
+    }
     JsonRoutes.sendResult(res, {
       code: 200,
       data: {