Merge remote-tracking branch 'Angtrim/feature-duplicate' into edge

1 files changed, 3 insertions, 1 deletions

diff --git a/server/rulesHelper.js b/server/rulesHelper.js
index 83710057..4c8ec4fa 100644
--- a/server/rulesHelper.js
+++ b/server/rulesHelper.js
@@ -141,13 +141,15 @@ RulesHelper = {
       Swimlanes.insert({
         title: action.swimlaneName,
         boardId,
+        sort: 0
       });
     }
     if(action.actionType === 'addChecklistWithItems'){
       const checkListId = Checklists.insert({'title':action.checklistName, 'cardId':card._id, 'sort':0});
       const itemsArray = action.checklistItems.split(',');
+      const checkList = Checklists.findOne({_id:checkListId});
       for(let i = 0; i <itemsArray.length; i++){
-        ChecklistItems.insert({title:itemsArray[i], checklistId:checkListId, cardId:card._id, 'sort':0});
+        ChecklistItems.insert({title:itemsArray[i], checklistId:checkListId, cardId:card._id, 'sort':checkList.itemCount()});
       }
     }
     if(action.actionType === 'createCard'){