diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-07-25 16:52:58 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-07-25 16:52:58 +0300 |
commit | 96c79f78ccdf1508dc8d4233adfb13b6324de8d1 (patch) | |
tree | 986bf40a8191895ebc5ab11b0935e8161e3d0c70 /models/import.js | |
parent | 7b4970a8d980f3918fcf7fbb584d7a67aae9cc13 (diff) | |
parent | 82d553721ceeec0813955345c50556dcd21ec545 (diff) | |
download | wekan-96c79f78ccdf1508dc8d4233adfb13b6324de8d1.tar.gz wekan-96c79f78ccdf1508dc8d4233adfb13b6324de8d1.tar.bz2 wekan-96c79f78ccdf1508dc8d4233adfb13b6324de8d1.zip |
Merge branch 'GhassenRjab-export-import-sandstorm' into devel
Export and import boards in Sandstorm.
Thanks to GhassenRjab ! Related #1144 and #799
Diffstat (limited to 'models/import.js')
-rw-r--r-- | models/import.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/models/import.js b/models/import.js index 2e58c90f..09769794 100644 --- a/models/import.js +++ b/models/import.js @@ -2,10 +2,11 @@ import { TrelloCreator } from './trelloCreator'; import { WekanCreator } from './wekanCreator'; Meteor.methods({ - importBoard(board, data, importSource) { + importBoard(board, data, importSource, currentBoard) { check(board, Object); check(data, Object); check(importSource, String); + check(currentBoard, Match.Maybe(String)); let creator; switch (importSource) { case 'trello': @@ -23,6 +24,6 @@ Meteor.methods({ // authorized) nothing to check, everyone can import boards in their account // 3. create all elements - return creator.create(board); + return creator.create(board, currentBoard); }, }); |