Revert In Progress additional vote features. Translations are not removed.

Thanks to xet7 !

Related https://github.com/wekan/wekan/pull/3048

1 files changed, 14 insertions, 39 deletions

diff --git a/models/cards.js b/models/cards.js
index 1633689e..72153132 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -340,10 +340,6 @@ Cards.attachSchema(
       type: Boolean,
       defaultValue: false,
     },
-    'vote.allowNonBoardMembers': {
-      type: Boolean,
-      defaultValue: false,
-    },
   }),
 );
 
@@ -351,8 +347,8 @@ Cards.allow({
   insert(userId, doc) {
     return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
   },
-  update(userId, doc, fields) {
-    return allowIsBoardMember(userId, Boards.findOne(doc.boardId)) || _.isEqual(fields, ['vote', 'modifiedAt', 'dateLastActivity']);
+  update(userId, doc) {
+    return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
   },
   remove(userId, doc) {
     return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
@@ -736,7 +732,7 @@ Cards.helpers({
 
   parentString(sep) {
     return this.parentList()
-      .map(function (elem) {
+      .map(function(elem) {
         return elem.title;
       })
       .join(sep);
@@ -1156,26 +1152,6 @@ Cards.helpers({
   isTemplateCard() {
     return this.type === 'template-card';
   },
-
-  votePublic() {
-    if (this.vote) return this.vote.public;
-    return null;
-  },
-  voteAllowNonBoardMembers() {
-    if (this.vote) return this.vote.allowNonBoardMembers;
-    return null;
-  },
-  voteCountNegative() {
-    if (this.vote && this.vote.negative) return this.vote.negative.length;
-    return null;
-  },
-  voteCountPositive() {
-    if (this.vote && this.vote.positive) return this.vote.positive.length;
-    return null;
-  },
-  voteCount() {
-    return this.voteCountPositive() + this.voteCountNegative()
-  },
 });
 
 Cards.mutations({
@@ -1499,13 +1475,12 @@ Cards.mutations({
       },
     };
   },
-  setVoteQuestion(question, public, allowNonBoardMembers) {
+  setVoteQuestion(question, public) {
     return {
       $set: {
         vote: {
           question,
           public,
-          allowNonBoardMembers,
           positive: [],
           negative: [],
         },
@@ -1954,7 +1929,7 @@ if (Meteor.isServer) {
   });
 
   //New activity for card moves
-  Cards.after.update(function (userId, doc, fieldNames) {
+  Cards.after.update(function(userId, doc, fieldNames) {
     const oldListId = this.previous.listId;
     const oldSwimlaneId = this.previous.swimlaneId;
     const oldBoardId = this.previous.boardId;
@@ -2000,7 +1975,7 @@ if (Meteor.isServer) {
         // change list modifiedAt, when user modified the key values in timingaction array, if it's endAt, put the modifiedAt of list back to one year ago for sorting purpose
         const modifiedAt = new Date(
           new Date(value).getTime() -
-          (action === 'endAt' ? 365 * 24 * 3600 * 1e3 : 0),
+            (action === 'endAt' ? 365 * 24 * 3600 * 1e3 : 0),
         ); // set it as 1 year before
         const boardId = list.boardId;
         Lists.direct.update(
@@ -2054,7 +2029,7 @@ if (Meteor.isServer) {
   JsonRoutes.add(
     'GET',
     '/api/boards/:boardId/swimlanes/:swimlaneId/cards',
-    function (req, res) {
+    function(req, res) {
       const paramBoardId = req.params.boardId;
       const paramSwimlaneId = req.params.swimlaneId;
       Authentication.checkBoardAccess(req.userId, paramBoardId);
@@ -2064,7 +2039,7 @@ if (Meteor.isServer) {
           boardId: paramBoardId,
           swimlaneId: paramSwimlaneId,
           archived: false,
-        }).map(function (doc) {
+        }).map(function(doc) {
           return {
             _id: doc._id,
             title: doc.title,
@@ -2088,7 +2063,7 @@ if (Meteor.isServer) {
    *                title: string,
    *                description: string}]
    */
-  JsonRoutes.add('GET', '/api/boards/:boardId/lists/:listId/cards', function (
+  JsonRoutes.add('GET', '/api/boards/:boardId/lists/:listId/cards', function(
     req,
     res,
   ) {
@@ -2101,7 +2076,7 @@ if (Meteor.isServer) {
         boardId: paramBoardId,
         listId: paramListId,
         archived: false,
-      }).map(function (doc) {
+      }).map(function(doc) {
         return {
           _id: doc._id,
           title: doc.title,
@@ -2123,7 +2098,7 @@ if (Meteor.isServer) {
   JsonRoutes.add(
     'GET',
     '/api/boards/:boardId/lists/:listId/cards/:cardId',
-    function (req, res) {
+    function(req, res) {
       const paramBoardId = req.params.boardId;
       const paramListId = req.params.listId;
       const paramCardId = req.params.cardId;
@@ -2155,7 +2130,7 @@ if (Meteor.isServer) {
    * @param {string} [assignees] the array of maximum one ID of assignee of the new card
    * @return_type {_id: string}
    */
-  JsonRoutes.add('POST', '/api/boards/:boardId/lists/:listId/cards', function (
+  JsonRoutes.add('POST', '/api/boards/:boardId/lists/:listId/cards', function(
     req,
     res,
   ) {
@@ -2262,7 +2237,7 @@ if (Meteor.isServer) {
   JsonRoutes.add(
     'PUT',
     '/api/boards/:boardId/lists/:listId/cards/:cardId',
-    function (req, res) {
+    function(req, res) {
       Authentication.checkUserId(req.userId);
       const paramBoardId = req.params.boardId;
       const paramCardId = req.params.cardId;
@@ -2561,7 +2536,7 @@ if (Meteor.isServer) {
   JsonRoutes.add(
     'DELETE',
     '/api/boards/:boardId/lists/:listId/cards/:cardId',
-    function (req, res) {
+    function(req, res) {
       Authentication.checkUserId(req.userId);
       const paramBoardId = req.params.boardId;
       const paramListId = req.params.listId;