瀏覽代碼

Fix allow normal user to view subtasks.

Thanks to xet7 !
Lauri Ojansivu 1 年之前
父節點
當前提交
22d98fec38
共有 2 個文件被更改,包括 23 次插入5 次删除
  1. 5 5
      client/components/cards/subtasks.jade
  2. 18 0
      client/components/cards/subtasks.js

+ 5 - 5
client/components/cards/subtasks.jade

@@ -26,8 +26,7 @@ template(name="subtaskDetail")
       .subtask-title
         span
         if canModifyCard
-          if currentUser.isBoardAdmin
-            a.fa.fa-navicon.subtask-details-menu.js-open-subtask-details-menu(title="{{_ 'subtaskActionsPopup-title'}}")
+          a.fa.fa-navicon.subtask-details-menu.js-open-subtask-details-menu(title="{{_ 'subtaskActionsPopup-title'}}")
         if canModifyCard
           h2.title.js-open-inlined-form.is-editable
             +viewer
@@ -95,7 +94,8 @@ template(name="subtaskActionsPopup")
       a.js-view-subtask(title="{{ subtask.title }}")
         i.fa.fa-eye
         | {{_ "view-it"}}
-      a.js-delete-subtask.delete-subtask
-        i.fa.fa-trash
-        | {{_ "delete"}} ...
+      if currentUser.isBoardAdmin
+        a.js-delete-subtask.delete-subtask
+          i.fa.fa-trash
+          | {{_ "delete"}} ...
 

+ 18 - 0
client/components/cards/subtasks.js

@@ -68,6 +68,10 @@ BlazeComponent.extendComponent({
     }
   },
 
+  isBoardAdmin() {
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
+  },
+
   editSubtask(event) {
     event.preventDefault();
     const textarea = this.find('textarea.js-edit-subtask-item');
@@ -104,6 +108,9 @@ BlazeComponent.extendComponent({
 }).register('subtaskItemDetail');
 
 BlazeComponent.extendComponent({
+  isBoardAdmin() {
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
+  },
   events() {
     return [
       {
@@ -129,3 +136,14 @@ BlazeComponent.extendComponent({
     ]
   }
 }).register('subtaskActionsPopup');
+
+Template.editSubtaskItemForm.helpers({
+  user() {
+    return ReactiveCache.getUser(this.userId);
+  },
+  isBoardAdmin() {
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
+  },
+});
+
+