From 3b6ec34bf504ebfc7e83416ec1a67ce37ecf907d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 27 Apr 2018 15:09:57 +0300 Subject: [PATCH 1/5] Try to fix snap build --- snapcraft.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 3c1dbb4ef..088e15247 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 From e721dba1e27aa91af1fc61f707ad0f5301bd5d39 Mon Sep 17 00:00:00 2001 From: ZeBBy <2991266+zebby76@users.noreply.github.com> Date: Fri, 27 Apr 2018 15:29:31 +0200 Subject: [PATCH 2/5] Fix Trello importation for ChecklistItems --- models/trelloCreator.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 89e48a16e..72af1f84b 100644 --- a/models/trelloCreator.js +++ b/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}}); } }); } From 116bc38136dd1a428b89e6f4daba934a62c16baa Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 27 Apr 2018 16:59:54 +0300 Subject: [PATCH 3/5] - Fix Trello import of ChecklistItems. Thanks to zebby76 ! --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb53b18da..828298b04 100644 --- a/CHANGELOG.md +++ b/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: From 212440862b0064e4903e126604f290856102c2ac Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 27 Apr 2018 17:49:14 +0300 Subject: [PATCH 4/5] Fix lint errors of https://github.com/wekan/wekan/pull/1611 Thanks to xet7 ! --- models/trelloCreator.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 72af1f84b..8920ff774 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -430,8 +430,7 @@ export class TrelloCreator { // keep track of Trello id => WeKan id this.checklists[checklist.id] = checklistId; // Now add the items to the checklistItems - var counter = 0; - const itemsToCreate = []; + let counter = 0; checklist.checkItems.forEach((item) => { counter++; const checklistItemTocreate = { From 1f42aac19f6e35ffe4eec582d6509ee8bf1eb151 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 27 Apr 2018 18:10:24 +0300 Subject: [PATCH 5/5] v0.88 --- CHANGELOG.md | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 828298b04..843eb0166 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v0.88 2018-04-27 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index 98c6415ab..0f379581d 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 c2cad939f..729abf399 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,