diff options
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | models/trelloCreator.js | 2 | ||||
| -rw-r--r-- | models/users.js | 6 | ||||
| -rw-r--r-- | models/wekanCreator.js | 6 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
6 files changed, 20 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f6fbd7f..9fb0c77c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.91 2018-05-01 Wekan release + +This release fixes the following bugs: + +- [Fix Wekan Import / Export lists not being sortable](https://github.com/wekan/wekan/commit/539c1ab87a098a7ddfd23cdbd663441bd609b73d). + +Thanks to GitHub user zebby76 for contributions. + # v0.90 2018-05-01 Wekan release This release adds the following new features: diff --git a/models/trelloCreator.js b/models/trelloCreator.js index 8920ff77..30f0bc2b 100644 --- a/models/trelloCreator.js +++ b/models/trelloCreator.js @@ -379,6 +379,7 @@ export class TrelloCreator { // we require. createdAt: this._now(this.createdAt.lists[list.id]), title: list.name, + sort: list.pos, }; const listId = Lists.direct.insert(listToCreate); Lists.direct.update(listId, {$set: {'updatedAt': this._now()}}); @@ -410,6 +411,7 @@ export class TrelloCreator { // we require. createdAt: this._now(), title: 'Default', + sort: 1, }; const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate); Swimlanes.direct.update(swimlaneId, {$set: {'updatedAt': this._now()}}); diff --git a/models/users.js b/models/users.js index 41179875..20331a98 100644 --- a/models/users.js +++ b/models/users.js @@ -566,10 +566,11 @@ if (Meteor.isServer) { Swimlanes.insert({ title: TAPi18n.__('welcome-swimlane'), boardId, + sort: 1, }, fakeUser); - ['welcome-list1', 'welcome-list2'].forEach((title) => { - Lists.insert({title: TAPi18n.__(title), boardId}, fakeUser); + ['welcome-list1', 'welcome-list2'].forEach((title, titleIndex) => { + Lists.insert({title: TAPi18n.__(title), boardId, sort: titleIndex}, fakeUser); }); }); }); @@ -754,4 +755,3 @@ if (Meteor.isServer) { } }); } - diff --git a/models/wekanCreator.js b/models/wekanCreator.js index aabcc717..4551979b 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -390,7 +390,7 @@ export class WekanCreator { } createLists(wekanLists, boardId) { - wekanLists.forEach((list) => { + wekanLists.forEach((list, listIndex) => { const listToCreate = { archived: list.archived, boardId, @@ -400,6 +400,7 @@ export class WekanCreator { // we require. createdAt: this._now(this.createdAt.lists[list.id]), title: list.title, + sort: list.sort ? list.sort : listIndex, }; const listId = Lists.direct.insert(listToCreate); Lists.direct.update(listId, {$set: {'updatedAt': this._now()}}); @@ -422,7 +423,7 @@ export class WekanCreator { } createSwimlanes(wekanSwimlanes, boardId) { - wekanSwimlanes.forEach((swimlane) => { + wekanSwimlanes.forEach((swimlane, swimlaneIndex) => { const swimlaneToCreate = { archived: swimlane.archived, boardId, @@ -432,6 +433,7 @@ export class WekanCreator { // we require. createdAt: this._now(this.createdAt.swimlanes[swimlane._id]), title: swimlane.title, + sort: swimlane.sort ? swimlane.sort : swimlaneIndex, }; const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate); Swimlanes.direct.update(swimlaneId, {$set: {'updatedAt': this._now()}}); diff --git a/package.json b/package.json index d865e2df..1afa5ee3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.90.0", + "version": "0.91.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 508c9514..dfbeec66 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 = 75, + appVersion = 76, # Increment this for every release. - appMarketingVersion = (defaultText = "0.90.0~2018-05-01"), + appMarketingVersion = (defaultText = "0.91.0~2018-05-01"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |