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 /client/components/import | |
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 'client/components/import')
-rw-r--r-- | client/components/import/import.jade | 2 | ||||
-rw-r--r-- | client/components/import/import.js | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/client/components/import/import.jade b/client/components/import/import.jade index d1b3489a..5e737cc6 100644 --- a/client/components/import/import.jade +++ b/client/components/import/import.jade @@ -15,6 +15,8 @@ template(name="importTextarea") p: label(for='import-textarea') {{_ instruction}} textarea.js-import-json(placeholder="{{_ 'import-json-placeholder'}}" autofocus) | {{jsonText}} + if isSandstorm + p.warning {{_ 'import-sandstorm-warning'}} input.primary.wide(type="submit" value="{{_ 'import'}}") template(name="importMapMembers") diff --git a/client/components/import/import.js b/client/components/import/import.js index d72a02dd..64170c1d 100644 --- a/client/components/import/import.js +++ b/client/components/import/import.js @@ -68,10 +68,12 @@ BlazeComponent.extendComponent({ this.importedData.get(), additionalData, this.importSource, + Session.get('fromBoard'), (err, res) => { if (err) { this.setError(err.error); } else { + Session.set('fromBoard', null); Utils.goBoardId(res); } } |