diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-06-14 19:38:16 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-06-14 19:38:16 +0300 |
| commit | 85e02010d444453a4a682770522a65fcdc488c8b (patch) | |
| tree | 4bdc971df59353fb2dffd03b6454ca0a4ef6cb16 /client/components | |
| parent | fa82efe7d24a18afbd99ba805bdc3666cf3ba863 (diff) | |
| parent | aeec9f6ef8d8de07c6c8b8001fe2bbeb012b9fa8 (diff) | |
| download | wekan-85e02010d444453a4a682770522a65fcdc488c8b.tar.gz wekan-85e02010d444453a4a682770522a65fcdc488c8b.tar.bz2 wekan-85e02010d444453a4a682770522a65fcdc488c8b.zip | |
Merge branch 'feuerball11-feature-custom-fields' into devel
Diffstat (limited to 'client/components')
| -rw-r--r-- | client/components/boards/boardBody.js | 2 | ||||
| -rw-r--r-- | client/components/cards/minicard.jade | 3 | ||||
| -rw-r--r-- | client/components/sidebar/sidebarCustomFields.jade | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 456bf9b3..dfe7b8d2 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -88,11 +88,13 @@ BlazeComponent.extendComponent({ isViewSwimlanes() { const currentUser = Meteor.user(); + if (!currentUser) return false; return (currentUser.profile.boardView === 'board-view-swimlanes'); }, isViewLists() { const currentUser = Meteor.user(); + if (!currentUser) return true; return (currentUser.profile.boardView === 'board-view-lists'); }, diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index b44021a6..c912ea70 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -37,7 +37,8 @@ template(name="minicard") .minicard-custom-field-item = definition.name .minicard-custom-field-item - = value + +viewer + = trueValue if members .minicard-members.js-minicard-members diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade index def083e9..fd31e5ac 100644 --- a/client/components/sidebar/sidebarCustomFields.jade +++ b/client/components/sidebar/sidebarCustomFields.jade @@ -37,7 +37,7 @@ template(name="createCustomFieldPopup") each dropdownItems.get input.js-dropdown-item(type="text" value=name placeholder="") input.js-dropdown-item.last(type="text" value="" placeholder="{{_ 'custom-field-dropdown-options-placeholder'}}") - a.flex.js-field-show-on-card + a.flex.js-field-show-on-card(class="{{#if showOnCard}}is-checked{{/if}}") .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}") span {{_ 'show-field-on-card'}} @@ -49,4 +49,4 @@ template(name="createCustomFieldPopup") template(name="deleteCustomFieldPopup") p {{_ "custom-field-delete-pop"}} - button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
\ No newline at end of file + button.js-confirm.negate.full(type="submit") {{_ 'delete'}} |