summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md9
-rw-r--r--models/import.js4
2 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a7467ec..ab8b593b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Upcoming Wekan release
+
+This release fixes the following bugs:
+
+* [Fix importing Trello board: Attribute correct members to their
+ comments](https://github.com/wekan/wekan/pull/1080).
+
+Thanks to GitHub user GhassenRjab for contributions.
+
# v0.24 2017-06-21 Wekan release
This release adds the following new features:
diff --git a/models/import.js b/models/import.js
index 4e78c53a..709d1699 100644
--- a/models/import.js
+++ b/models/import.js
@@ -285,7 +285,7 @@ class TrelloCreator {
createdAt: this._now(comment.date),
text: comment.data.text,
// we attribute the comment to the original author, default to current user
- userId: this._user(comment.memberCreator.id),
+ userId: this._user(comment.idMemberCreator),
};
// dateLastActivity will be set from activity insert, no need to
// update it ourselves
@@ -298,7 +298,7 @@ class TrelloCreator {
createdAt: this._now(commentToCreate.createdAt),
// we attribute the addComment (not the import)
// to the original author - it is needed by some UI elements.
- userId: this._user(commentToCreate.userId),
+ userId: commentToCreate.userId,
});
});
}