diff options
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | models/trelloCreator.js | 17 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
| -rw-r--r-- | snapcraft.yaml | 6 |
5 files changed, 25 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fb53b18d..843eb016 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.88 2018-04-27 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: diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 89e48a16..8920ff77 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -429,17 +429,20 @@ 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 - const itemsToCreate = []; + // Now add the items to the checklistItems + let counter = 0; 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}}); } }); } diff --git a/package.json b/package.json index 98c6415a..0f379581 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.87.0", + "version": "0.88.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index c2cad939..729abf39 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 72, + appVersion = 73, # Increment this for every release. - appMarketingVersion = (defaultText = "0.87.0~2018-04-27"), + appMarketingVersion = (defaultText = "0.88.0~2018-04-27"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index 3c1dbb4e..088e1524 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -138,13 +138,15 @@ parts: meteor npm install --allow-superuser meteor build .build --directory --allow-superuser cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js - oldpath=`pwd` cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt rm -rf node_modules/bcrypt meteor npm install --save bcrypt - cd $oldpath + # Change to directory .build/bundle/programs/server + cd ../../../../ npm install meteor npm install --save bcrypt + # Change back to Wekan source directory + cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan |