소스 검색

Added to Board Settings: Minicard Settings and All Boards Settings improvements.

Thanks to xet7 !

Related https://github.com/wekan/wekan/pull/4477
Lauri Ojansivu 3 년 전
부모
커밋
95a4b4fd91
3개의 변경된 파일72개의 추가작업 그리고 26개의 파일을 삭제
  1. 1 0
      client/components/boards/boardHeader.js
  2. 14 6
      client/components/sidebar/sidebar.jade
  3. 57 20
      client/components/sidebar/sidebar.js

+ 1 - 0
client/components/boards/boardHeader.js

@@ -32,6 +32,7 @@ Template.boardMenuPopup.events({
   'click .js-import-board': Popup.open('chooseBoardSource'),
   'click .js-import-board': Popup.open('chooseBoardSource'),
   'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
   'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
   'click .js-card-settings': Popup.open('boardCardSettings'),
   'click .js-card-settings': Popup.open('boardCardSettings'),
+  'click .js-minicard-settings': Popup.open('boardMinicardSettings'),
 });
 });
 
 
 Template.boardChangeTitlePopup.events({
 Template.boardChangeTitlePopup.events({

+ 14 - 6
client/components/sidebar/sidebar.jade

@@ -252,12 +252,6 @@ template(name="boardCardSettingsPopup")
           i.fa.fa-align-left
           i.fa.fa-align-left
           | {{_ 'description'}}
           | {{_ 'description'}}
           | {{_ 'custom-field-text'}}
           | {{_ 'custom-field-text'}}
-    div.check-div
-      a.flex.js-field-has-description-text-on-minicard(class="{{#if allowsDescriptionTextOnMinicard}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if allowsDescriptionTextOnMinicard}}is-checked{{/if}}")
-        span
-          i.fa.fa-align-left
-          | {{_ 'description-on-minicard'}}
     div.check-div
     div.check-div
       a.flex.js-field-has-checklists(class="{{#if allowsChecklists}}is-checked{{/if}}")
       a.flex.js-field-has-checklists(class="{{#if allowsChecklists}}is-checked{{/if}}")
         .materialCheckBox(class="{{#if allowsChecklists}}is-checked{{/if}}")
         .materialCheckBox(class="{{#if allowsChecklists}}is-checked{{/if}}")
@@ -289,6 +283,16 @@ template(name="boardCardSettingsPopup")
     //      i.fa.fa-history
     //      i.fa.fa-history
     //      | {{_ 'activities'}}
     //      | {{_ 'activities'}}
 
 
+template(name="boardMinicardSettingsPopup")
+  form.board-minicard-settings
+    h3 {{_ 'show-on-minicard'}}
+    div.check-div
+      a.flex.js-field-has-description-text-on-minicard(class="{{#if allowsDescriptionTextOnMinicard}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if allowsDescriptionTextOnMinicard}}is-checked{{/if}}")
+        span
+          i.fa.fa-align-left
+          | {{_ 'description-on-minicard'}}
+
 template(name="boardSubtaskSettingsPopup")
 template(name="boardSubtaskSettingsPopup")
   form.board-subtask-settings
   form.board-subtask-settings
     h3 {{_ 'show-parent-in-minicard'}}
     h3 {{_ 'show-parent-in-minicard'}}
@@ -424,6 +428,10 @@ template(name="boardMenuPopup")
         a.js-card-settings
         a.js-card-settings
           i.fa.fa-id-card-o
           i.fa.fa-id-card-o
           | {{_ 'card-settings'}}
           | {{_ 'card-settings'}}
+      li
+        a.js-minicard-settings
+          i.fa.fa-id-card-o
+          | {{_ 'minicard-settings'}}
       li
       li
         a.js-subtask-settings
         a.js-subtask-settings
           i.fa.fa-sitemap
           i.fa.fa-sitemap

+ 57 - 20
client/components/sidebar/sidebar.js

@@ -218,6 +218,7 @@ Template.boardMenuPopup.events({
   'click .js-import-board': Popup.open('chooseBoardSource'),
   'click .js-import-board': Popup.open('chooseBoardSource'),
   'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
   'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
   'click .js-card-settings': Popup.open('boardCardSettings'),
   'click .js-card-settings': Popup.open('boardCardSettings'),
+  'click .js-minicard-settings': Popup.open('boardMinicardSettings'),
   'click .js-export-board': Popup.open('exportBoard'),
   'click .js-export-board': Popup.open('exportBoard'),
 });
 });
 
 
@@ -914,10 +915,6 @@ BlazeComponent.extendComponent({
     return this.currentBoard.allowsDescriptionText;
     return this.currentBoard.allowsDescriptionText;
   },
   },
 
 
-  allowsDescriptionTextOnMinicard() {
-    return this.currentBoard.allowsDescriptionTextOnMinicard;
-  },
-
   isBoardSelected() {
   isBoardSelected() {
     return this.currentBoard.dateSettingsDefaultBoardID;
     return this.currentBoard.dateSettingsDefaultBoardID;
   },
   },
@@ -1201,22 +1198,6 @@ BlazeComponent.extendComponent({
             this.currentBoard.allowsDescriptionText,
             this.currentBoard.allowsDescriptionText,
           );
           );
         },
         },
-        'click .js-field-has-description-text-on-minicard'(evt) {
-          evt.preventDefault();
-          this.currentBoard.allowsDescriptionTextOnMinicard = !this.currentBoard
-            .allowsDescriptionTextOnMinicard;
-          this.currentBoard.setallowsDescriptionTextOnMinicard(
-            this.currentBoard.allowsDescriptionTextOnMinicard,
-          );
-          $(`.js-field-has-description-text-on-minicard ${MCB}`).toggleClass(
-            CKCLS,
-            this.currentBoard.allowsDescriptionTextOnMinicard,
-          );
-          $('.js-field-has-description-text-on-minicard').toggleClass(
-            CKCLS,
-            this.currentBoard.allowsDescriptionTextOnMinicard,
-          );
-        },
         'click .js-field-has-checklists'(evt) {
         'click .js-field-has-checklists'(evt) {
           evt.preventDefault();
           evt.preventDefault();
           this.currentBoard.allowsChecklists = !this.currentBoard
           this.currentBoard.allowsChecklists = !this.currentBoard
@@ -1283,6 +1264,62 @@ BlazeComponent.extendComponent({
   },
   },
 }).register('boardCardSettingsPopup');
 }).register('boardCardSettingsPopup');
 
 
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+  },
+
+  allowsDescriptionTextOnMinicard() {
+    return this.currentBoard.allowsDescriptionTextOnMinicard;
+  },
+
+ lists() {
+    return Lists.find(
+      {
+        boardId: this.currentBoard._id,
+        archived: false,
+      },
+      {
+        sort: ['title'],
+      },
+    );
+  },
+
+  hasLists() {
+    return this.lists().count() > 0;
+  },
+
+  isListSelected() {
+    return (
+      this.currentBoard.dateSettingsDefaultBoardId === this.currentData()._id
+    );
+  },
+
+  events() {
+    return [
+      {
+        'click .js-field-has-description-text-on-minicard'(evt) {
+          evt.preventDefault();
+          this.currentBoard.allowsDescriptionTextOnMinicard = !this.currentBoard
+            .allowsDescriptionTextOnMinicard;
+          this.currentBoard.setallowsDescriptionTextOnMinicard(
+            this.currentBoard.allowsDescriptionTextOnMinicard,
+          );
+          $(`.js-field-has-description-text-on-minicard ${MCB}`).toggleClass(
+            CKCLS,
+            this.currentBoard.allowsDescriptionTextOnMinicard,
+          );
+          $('.js-field-has-description-text-on-minicard').toggleClass(
+            CKCLS,
+            this.currentBoard.allowsDescriptionTextOnMinicard,
+          );
+        },
+      },
+    ];
+  },
+}).register('boardMinicardSettingsPopup');
+
 BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
   onCreated() {
   onCreated() {
     this.error = new ReactiveVar('');
     this.error = new ReactiveVar('');