Merge branch 'GhassenRjab-export-import-sandstorm' into devel

Export and import boards in Sandstorm.
Thanks to GhassenRjab ! Related #1144 and #799

5 files changed, 28 insertions, 2 deletions

diff --git a/client/components/boards/boardArchive.js b/client/components/boards/boardArchive.js
index aab1e2c6..acb53149 100644
--- a/client/components/boards/boardArchive.js
+++ b/client/components/boards/boardArchive.js
@@ -18,6 +18,13 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       'click .js-restore-board'() {
+        // TODO : Make isSandstorm variable global
+        const isSandstorm = Meteor.settings && Meteor.settings.public &&
+          Meteor.settings.public.sandstorm;
+        if (isSandstorm && Session.get('currentBoard')) {
+          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          currentBoard.archive();
+        }
         const board = this.currentData();
         board.restore();
         Utils.goBoardId(board._id);
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index d33ee11b..3d98322d 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -71,6 +71,12 @@ template(name="boardHeaderBar")
               title="{{_ 'log-in'}}")
               i.fa.fa-sign-in
               span {{_ 'log-in'}}
+              
+      if isSandstorm
+        if currentUser
+          a.board-header-btn.js-open-archived-board
+            i.fa.fa-archive
+            span {{_ 'archives'}}
 
       a.board-header-btn.js-open-filter-view(
           title="{{#if Filter.isActive}}{{_ 'filter-on-desc'}}{{else}}{{_ 'filter'}}{{/if}}"
@@ -113,6 +119,11 @@ template(name="boardMenuPopup")
         li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
         li: a.js-archive-board {{_ 'archive-board'}}
         li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
+  if isSandstorm
+    hr
+    ul.pop-over-list
+      li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
+      li: a.js-import-board {{_ 'import-board-c'}}
 
 template(name="boardVisibilityList")
   ul.pop-over-list
@@ -197,9 +208,9 @@ template(name="createBoard")
 template(name="chooseBoardSource")
   ul.pop-over-list
     li
-      a(href="{{pathFor 'import/trello'}}") {{_ 'from-trello'}}
+      a(href="{{pathFor '/import/trello'}}") {{_ 'from-trello'}}
     li
-      a(href="{{pathFor 'import/wekan'}}") {{_ 'from-wekan'}}
+      a(href="{{pathFor '/import/wekan'}}") {{_ 'from-wekan'}}
 
 template(name="boardChangeTitlePopup")
   form
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index dafbfd30..2ee21905 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({
@@ -76,6 +77,9 @@ BlazeComponent.extendComponent({
       'click .js-open-board-menu': Popup.open('boardMenu'),
       'click .js-change-visibility': Popup.open('boardChangeVisibility'),
       'click .js-watch-board': Popup.open('boardChangeWatch'),
+      'click .js-open-archived-board'() {
+        Modal.open('archivedBoards');
+      },
       'click .js-open-filter-view'() {
         Sidebar.setView('filter');
       },
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);
         }
       }