diff options
| author | Ghassen Rjab <rjab.ghassen@gmail.com> | 2017-07-24 23:56:51 +0100 |
|---|---|---|
| committer | Ghassen Rjab <rjab.ghassen@gmail.com> | 2017-07-24 23:56:51 +0100 |
| commit | d2b1a837e677b62e10a14c1599c4ff59ee21ff34 (patch) | |
| tree | fae98d33bf797d84dc282fdf30fe1468cfb5dcd6 /client/components | |
| parent | f34ef01de90bbb1ed3fbbb1deac9cbe968848de8 (diff) | |
| download | wekan-d2b1a837e677b62e10a14c1599c4ff59ee21ff34.tar.gz wekan-d2b1a837e677b62e10a14c1599c4ff59ee21ff34.tar.bz2 wekan-d2b1a837e677b62e10a14c1599c4ff59ee21ff34.zip | |
Import boards in Sandstorm
Diffstat (limited to 'client/components')
| -rw-r--r-- | client/components/boards/boardHeader.js | 1 | ||||
| -rw-r--r-- | client/components/import/import.jade | 2 | ||||
| -rw-r--r-- | client/components/import/import.js | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index dafbfd30..6af3e320 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -14,6 +14,7 @@ Template.boardMenuPopup.events({ FlowRouter.go('home'); }), 'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'), + 'click .js-import-board': Popup.open('chooseBoardSource'), }); Template.boardMenuPopup.helpers({ 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); } } |