Merge branch 'rjevnikar-boardViewMigration' into devel

Fixes #1675

2 files changed, 16 insertions, 6 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 422cb2eb..ccaefc8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release possibly fixes the following bugs, please test:
+
+* [Try to fix: Missing board-view-lists Field after DB updated to Wekan 1.02](https://github.com/wekan/wekan/issues/1675).
+
+Thanks to GitHub user rjevnikar for contributions.
+
 # v1.02 2018-05-26 Wekan release
 
 This release fixes the following bugs:
diff --git a/server/migrations.js b/server/migrations.js
index d59d6d8f..f877200a 100644
--- a/server/migrations.js
+++ b/server/migrations.js
@@ -211,12 +211,14 @@ Migrations.add('add-checklist-items', () => {
 
 Migrations.add('add-profile-view', () => {
   Users.find().forEach((user) => {
-    // Set default view
-    Users.direct.update(
-      { _id: user._id },
-      { $set: { 'profile.boardView': 'board-view-lists' } },
-      noValidate
-    );
+    if (!user.hasOwnProperty('profile.boardView')) {
+      // Set default view
+      Users.direct.update(
+        { _id: user._id },
+        { $set: { 'profile.boardView': 'board-view-lists' } },
+        noValidate
+      );
+    }
   });
 });