Browse Source

Merge branch 'zebby76-devel' into devel

Lauri Ojansivu 7 years ago
parent
commit
21e68f3e54
2 changed files with 18 additions and 6 deletions
  1. 8 0
      CHANGELOG.md
  2. 10 6
      models/trelloCreator.js

+ 8 - 0
CHANGELOG.md

@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Trello import of ChecklistItems](https://github.com/wekan/wekan/pull/1611).
+
+Thanks to Github user zebby76 for contributions.
+
 # v0.87 2018-04-27 Wekan release
 
 This release fixes the following bugs:

+ 10 - 6
models/trelloCreator.js

@@ -429,17 +429,21 @@ export class TrelloCreator {
         const checklistId = Checklists.direct.insert(checklistToCreate);
         // keep track of Trello id => WeKan id
         this.checklists[checklist.id] = checklistId;
-        // Now add the items to the checklist
+        // Now add the items to the checklistItems
+        var counter = 0;
         const itemsToCreate = [];
         checklist.checkItems.forEach((item) => {
-          itemsToCreate.push({
-            _id: checklistId + itemsToCreate.length,
+          counter++;
+          const checklistItemTocreate = {
+            _id: checklistId + counter,
             title: item.name,
-            isFinished: item.state === 'complete',
+            checklistId: this.checklists[checklist.id],
+            cardId: this.cards[checklist.idCard],
             sort: item.pos,
-          });
+            isFinished: item.state === 'complete',
+          };
+          ChecklistItems.direct.insert(checklistItemTocreate);
         });
-        Checklists.direct.update(checklistId, {$set: {items: itemsToCreate}});
       }
     });
   }