浏览代码

Fixed card move to top/bottom

Angelo Gallarello 6 年之前
父节点
当前提交
99d38f2d61
共有 2 个文件被更改,包括 13 次插入2 次删除
  1. 11 0
      models/lists.js
  2. 2 2
      server/rulesHelper.js

+ 11 - 0
models/lists.js

@@ -86,6 +86,17 @@ Lists.helpers({
       { sort: ['sort'] });
       { sort: ['sort'] });
   },
   },
 
 
+  cardsUnfiltered(swimlaneId) {
+    const selector = {
+      listId: this._id,
+      archived: false,
+    };
+    if (swimlaneId)
+      selector.swimlaneId = swimlaneId;
+    return Cards.find(selector,
+      { sort: ['sort'] });
+  },
+
   allCards() {
   allCards() {
     return Cards.find({ listId: this._id });
     return Cards.find({ listId: this._id });
   },
   },

+ 2 - 2
server/rulesHelper.js

@@ -43,7 +43,7 @@ RulesHelper = {
         list = Lists.findOne({title: action.listTitle, boardId });
         list = Lists.findOne({title: action.listTitle, boardId });
         listId = list._id;
         listId = list._id;
       }
       }
-      const minOrder = _.min(list.cards(card.swimlaneId).map((c) => c.sort));
+      const minOrder = _.min(list.cardsUnfiltered(card.swimlaneId).map((c) => c.sort));
       card.move(card.swimlaneId, listId, minOrder - 1);
       card.move(card.swimlaneId, listId, minOrder - 1);
     }
     }
     if(action.actionType === 'moveCardToBottom'){
     if(action.actionType === 'moveCardToBottom'){
@@ -56,7 +56,7 @@ RulesHelper = {
         list = Lists.findOne({title: action.listTitle, boardId});
         list = Lists.findOne({title: action.listTitle, boardId});
         listId = list._id;
         listId = list._id;
       }
       }
-      const maxOrder = _.max(list.cards(card.swimlaneId).map((c) => c.sort));
+      const maxOrder = _.max(list.cardsUnfiltered(card.swimlaneId).map((c) => c.sort));
       card.move(card.swimlaneId, listId, maxOrder + 1);
       card.move(card.swimlaneId, listId, maxOrder + 1);
     }
     }
     if(action.actionType === 'sendEmail'){
     if(action.actionType === 'sendEmail'){