Browse Source

Merge branch 'GhassenRjab-hotfix/sandstorm-export-import' into devel

Fix Wekan Import Export on Standalone and Sandstorm.
Thanks to GhassenRjab and xet7 ! Related #799
Lauri Ojansivu 7 years ago
parent
commit
31c7ada591
2 changed files with 5 additions and 3 deletions
  1. 3 2
      CHANGELOG.md
  2. 2 1
      models/wekanCreator.js

+ 3 - 2
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

+ 2 - 1
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,