1 files changed, 34 insertions, 18 deletions
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index a76b566a..10d9925a 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -15,17 +15,17 @@ Template.boardMenuPopup.events({
   }),
 });
 
-Template.boardMenuPopup.helpers({
-  exportUrl() {
-    const boardId = Session.get('currentBoard');
-    const loginToken = Accounts._storedLoginToken();
-    return FlowRouter.url(`api/boards/${boardId}?authToken=${loginToken}`);
-  },
-  exportFilename() {
-    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.json`;
-  },
-});
+// Template.boardMenuPopup.helpers({
+//  exportUrl() {
+//    const boardId = Session.get('currentBoard');
+//    const loginToken = Accounts._storedLoginToken();
+//    return FlowRouter.url(`api/boards/${boardId}?authToken=${loginToken}`);
+//  },
+//  exportFilename() {
+//    const boardId = Session.get('currentBoard');
+//    return `wekan-export-board-${boardId}.json`;
+//  },
+// });
 
 Template.boardChangeTitlePopup.events({
   submit(evt, tpl) {
@@ -97,6 +97,12 @@ BlazeComponent.extendComponent({
   },
 }).register('boardHeaderBar');
 
+Template.boardHeaderBar.helpers({
+  canModifyBoard() {
+    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
+  },
+});
+
 BlazeComponent.extendComponent({
   backgroundColors() {
     return Boards.simpleSchema()._schema.color.allowedValues;
@@ -119,10 +125,15 @@ BlazeComponent.extendComponent({
   },
 }).register('boardChangeColorPopup');
 
-BlazeComponent.extendComponent({
+const CreateBoard = BlazeComponent.extendComponent({
+  template() {
+    return 'createBoard';
+  },
+
   onCreated() {
     this.visibilityMenuIsOpen = new ReactiveVar(false);
     this.visibility = new ReactiveVar('private');
+    this.boardId = new ReactiveVar('');
   },
 
   visibilityCheck() {
@@ -143,15 +154,12 @@ BlazeComponent.extendComponent({
     const title = this.find('.js-new-board-title').value;
     const visibility = this.visibility.get();
 
-    const boardId = Boards.insert({
+    this.boardId.set(Boards.insert({
       title,
       permission: visibility,
-    });
-
-    Utils.goBoardId(boardId);
+    }));
 
-    // Immediately star boards crated with the headerbar popup.
-    Meteor.user().toggleBoardStar(boardId);
+    Utils.goBoardId(this.boardId.get());
   },
 
   events() {
@@ -166,6 +174,14 @@ BlazeComponent.extendComponent({
   },
 }).register('createBoardPopup');
 
+(class HeaderBarCreateBoard extends CreateBoard {
+  onSubmit(evt) {
+    super.onSubmit(evt);
+    // Immediately star boards crated with the headerbar popup.
+    Meteor.user().toggleBoardStar(this.boardId.get());
+  }
+}).register('headerBarCreateBoardPopup');
+
 BlazeComponent.extendComponent({
   visibilityCheck() {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));