diff options
author | Andrés Manelli <andresmanelli@gmail.com> | 2019-02-22 23:48:23 +0100 |
---|---|---|
committer | Andrés Manelli <andresmanelli@gmail.com> | 2019-02-24 00:05:00 +0100 |
commit | 64bf455b296a10369e8318183c2c6cd61a122869 (patch) | |
tree | 54b9612c3700cf711ef697217fd295fba7e4a9c1 /client | |
parent | 0a53ee87b94232608b5131f47dd77d2fa4bbc5ba (diff) | |
download | wekan-64bf455b296a10369e8318183c2c6cd61a122869.tar.gz wekan-64bf455b296a10369e8318183c2c6cd61a122869.tar.bz2 wekan-64bf455b296a10369e8318183c2c6cd61a122869.zip |
Save template swimlanes in profile. Fix swimlane view for templates board. Avoid deleting template containers
Diffstat (limited to 'client')
-rw-r--r-- | client/components/boards/boardBody.jade | 9 | ||||
-rw-r--r-- | client/components/boards/boardHeader.jade | 12 | ||||
-rw-r--r-- | client/components/boards/boardsList.js | 4 | ||||
-rw-r--r-- | client/components/swimlanes/swimlaneHeader.jade | 7 | ||||
-rw-r--r-- | client/components/users/userHeader.js | 4 |
5 files changed, 21 insertions, 15 deletions
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 3a40921d..e36058f6 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -20,12 +20,15 @@ template(name="boardBody") class="{{#if draggingActive.get}}is-dragging-active{{/if}}") if showOverlay.get .board-overlay - if isViewSwimlanes + if currentBoard.isTemplatesBoard each currentBoard.swimlanes +swimlane(this) - if isViewLists + else if isViewSwimlanes + each currentBoard.swimlanes + +swimlane(this) + else if isViewLists +listsGroup - if isViewCalendar + else if isViewCalendar +calendarView template(name="calendarView") diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 75b2f02b..4c9d6e43 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -96,10 +96,11 @@ template(name="boardHeaderBar") i.fa.fa-search span {{_ 'search'}} - a.board-header-btn.js-toggle-board-view( - title="{{_ 'board-view'}}") - i.fa.fa-th-large - span {{_ currentUser.profile.boardView}} + unless currentBoard.isTemplatesBoard + a.board-header-btn.js-toggle-board-view( + title="{{_ 'board-view'}}") + i.fa.fa-th-large + span {{_ currentUser.profile.boardView}} if canModifyBoard a.board-header-btn.js-multiselection-activate( @@ -132,7 +133,8 @@ template(name="boardMenuPopup") hr ul.pop-over-list li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}} - li: a.js-archive-board {{_ 'archive-board'}} + unless currentBoard.isTemplatesBoard + li: a.js-archive-board {{_ 'archive-board'}} li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}} hr ul.pop-over-list diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index 70dd1143..3fd2d889 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -8,10 +8,10 @@ Template.boardListHeaderBar.events({ Template.boardListHeaderBar.helpers({ templatesBoardId() { - return Meteor.user().getTemplatesBoard().id; + return Meteor.user().getTemplatesBoardId(); }, templatesBoardSlug() { - return Meteor.user().getTemplatesBoard().slug; + return Meteor.user().getTemplatesBoardSlug(); }, }); diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade index 33eb5731..ac4a0327 100644 --- a/client/components/swimlanes/swimlaneHeader.jade +++ b/client/components/swimlanes/swimlaneHeader.jade @@ -22,9 +22,10 @@ template(name="swimlaneActionPopup") unless currentUser.isCommentOnly ul.pop-over-list li: a.js-set-swimlane-color {{_ 'select-color'}} - hr - ul.pop-over-list - li: a.js-close-swimlane {{_ 'archive-swimlane'}} + unless this.isTemplateContainer + hr + ul.pop-over-list + li: a.js-close-swimlane {{_ 'archive-swimlane'}} template(name="swimlaneAddPopup") unless currentUser.isCommentOnly diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 0978ec75..29b29534 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -5,10 +5,10 @@ Template.headerUserBar.events({ Template.memberMenuPopup.helpers({ templatesBoardId() { - return Meteor.user().getTemplatesBoard().id; + return Meteor.user().getTemplatesBoardId(); }, templatesBoardSlug() { - return Meteor.user().getTemplatesBoard().slug; + return Meteor.user().getTemplatesBoardSlug(); }, }); |