Преглед на файлове

Add delete board to Recycle Bin, fix delete-board menu item on board menu

RJevnikar преди 7 години
родител
ревизия
de59758471
променени са 3 файла, в които са добавени 24 реда и са изтрити 1 реда
  1. 10 0
      client/components/boards/boardArchive.jade
  2. 12 0
      client/components/boards/boardArchive.js
  3. 2 1
      i18n/en.i18n.json

+ 10 - 0
client/components/boards/boardArchive.jade

@@ -9,6 +9,16 @@ template(name="archivedBoards")
         button.js-restore-board
           i.fa.fa-undo
           | {{_ 'restore-board'}}
+        button.js-delete-board
+          i.fa.fa-trash-o
+          | {{_ 'delete-board'}}
         = title
     else
       li.no-items-message {{_ 'no-archived-boards'}}
+
+template(name="deleteBoardPopup")
+  p {{_ 'delete-board-pop'}}
+  unless archived
+    p {{_ 'board-delete-suggest-archive'}}
+  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
+

+ 12 - 0
client/components/boards/boardArchive.js

@@ -29,6 +29,18 @@ BlazeComponent.extendComponent({
         board.restore();
         Utils.goBoardId(board._id);
       },
+      'click .js-delete': Popup.afterConfirm('cardDelete', function() {
+        Popup.close();
+        const isSandstorm = Meteor.settings && Meteor.settings.public &&
+          Meteor.settings.public.sandstorm;
+        if (isSandstorm && Session.get('currentBoard')) {
+          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          Boards.remove(currentBoard._id);
+        }
+        const board = this.currentData();
+        Boards.remove(board._id);
+        FlowRouter.go('home');
+      }),
     }];
   },
 }).register('archivedBoards');

+ 2 - 1
i18n/en.i18n.json

@@ -474,5 +474,6 @@
     "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
     "board-delete-pop": "All lists, cards, labels, and activities will be removed and you won't be able to recover the board contents. There is no undo.",
     "board-delete-suggest-archive": "You can archive a board to remove it from the the active boards and preserve the activity.",
-    "deleteBoardPopup": "Delete Board?"
+    "deleteBoardPopup": "Delete Board?",
+    "delete-board": "Delete Board"
 }