diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-08-29 02:03:53 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-08-29 02:03:53 +0300 |
| commit | 31c7ada59106e697665027ae5a6248200070d9c5 (patch) | |
| tree | 5e8dc184d98a0b8c48f0f044a2b2157f271924ce | |
| parent | 06644d9c714db046def9325612b64ab77a850c38 (diff) | |
| parent | b4ec609fe06aba6ad634020fa10f979ca74e0da0 (diff) | |
| download | wekan-31c7ada59106e697665027ae5a6248200070d9c5.tar.gz wekan-31c7ada59106e697665027ae5a6248200070d9c5.tar.bz2 wekan-31c7ada59106e697665027ae5a6248200070d9c5.zip | |
Merge branch 'GhassenRjab-hotfix/sandstorm-export-import' into devel
Fix Wekan Import Export on Standalone and Sandstorm.
Thanks to GhassenRjab and xet7 ! Related #799
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | models/wekanCreator.js | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 008e5608..a1f365c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,9 +17,10 @@ and fixes the following bugs: * [Fix Squeezed tickbox in Card](https://github.com/wekan/wekan/pull/1171); * [Percent-encode SMTP password to prevent URI malformed - errors](https://github.com/wekan/wekan/pull/1190). + errors](https://github.com/wekan/wekan/pull/1190); +* [Fix Wekan Import Export on Standalone and Sandstorm](https://github.com/wekan/wekan/pull/1197). -Thanks to GitHub users andresmanelli, danhawkes, jonasob, kubiko, nztqa, +Thanks to GitHub users andresmanelli, danhawkes, GhassenRjab, jonasob, kubiko, nztqa, pkuhner and xet7 for their contributions. # v0.32 2017-07-30 Wekan release diff --git a/models/wekanCreator.js b/models/wekanCreator.js index b5f9b0ff..36e5e1ca 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -71,7 +71,6 @@ export class WekanCreator { checkActivities(wekanActivities) { check(wekanActivities, [Match.ObjectIncluding({ - userId: String, activityType: String, createdAt: DateString, })]); @@ -141,6 +140,8 @@ export class WekanCreator { isActive: true, isCommentOnly: false, }], + // Standalone Export has modifiedAt missing, adding modifiedAt to fix it + modifiedAt: this._now(wekanBoard.modifiedAt), permission: wekanBoard.permission, slug: getSlug(wekanBoard.title) || 'board', stars: 0, |