소스 검색

Merge branch 'GhassenRjab-fix-trello-import' into devel

Import due date from Trello. Thanks to GhassenRjab ! Closes #1081
Lauri Ojansivu 8 년 전
부모
커밋
868587c409
2개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      CHANGELOG.md
  2. 1 0
      models/import.js

+ 5 - 1
CHANGELOG.md

@@ -1,6 +1,10 @@
 # Upcoming Wekan release
 # Upcoming Wekan release
 
 
-This release fixes the following bugs:
+This release adds the following new features:
+
+* [Import due date from Trello](https://github.com/wekan/wekan/pull/1082).
+
+and fixes the following bugs:
 
 
 * [Fix importing Trello board: Attribute correct members to their
 * [Fix importing Trello board: Attribute correct members to their
    comments](https://github.com/wekan/wekan/pull/1080);
    comments](https://github.com/wekan/wekan/pull/1080);

+ 1 - 0
models/import.js

@@ -229,6 +229,7 @@ class TrelloCreator {
         title: card.name,
         title: card.name,
         // we attribute the card to its creator if available
         // we attribute the card to its creator if available
         userId: this._user(this.createdBy.cards[card.id]),
         userId: this._user(this.createdBy.cards[card.id]),
+        dueAt: card.due ? this._now(card.due) : null,
       };
       };
       // add labels
       // add labels
       if (card.idLabels) {
       if (card.idLabels) {