diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-01-05 21:28:14 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-01-05 21:28:14 +0200 |
commit | f6f7705f23ea18d7f1b8f8736b762eb89e00a3cf (patch) | |
tree | d1213a62330b38c1a293f39a8b5265deefff0535 /client/components/users | |
parent | 6209b792aa9548ba66691fcaa0033ec9c29a3c7c (diff) | |
download | wekan-f6f7705f23ea18d7f1b8f8736b762eb89e00a3cf.tar.gz wekan-f6f7705f23ea18d7f1b8f8736b762eb89e00a3cf.tar.bz2 wekan-f6f7705f23ea18d7f1b8f8736b762eb89e00a3cf.zip |
Add Worker role.
This was originally added at Wekan v3.58,
reverted at Wekan v3.60 because of bugs,
and now after fixes added back.
Thanks to xet7 !
Closes #2788
Diffstat (limited to 'client/components/users')
-rw-r--r-- | client/components/users/userAvatar.jade | 3 | ||||
-rw-r--r-- | client/components/users/userHeader.jade | 31 |
2 files changed, 19 insertions, 15 deletions
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index ff4a1ce6..7f2067ce 100644 --- a/client/components/users/userAvatar.jade +++ b/client/components/users/userAvatar.jade @@ -73,7 +73,8 @@ template(name="cardMemberPopup") p.quiet @{{ user.username }} ul.pop-over-list if currentUser.isNotCommentOnly - li: a.js-remove-member {{_ 'remove-member-from-card'}} + if currentUser.isNotWorker + li: a.js-remove-member {{_ 'remove-member-from-card'}} if $eq currentUser._id user._id with currentUser diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index aa567e91..9306d21d 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -39,12 +39,13 @@ template(name="memberMenuPopup") a.js-go-setting(href="{{pathFor 'setting'}}") i.fa.fa-lock | {{_ 'admin-panel'}} - hr - ul.pop-over-list - li - a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") - i.fa.fa-clone - | {{_ 'templates'}} + unless currentUser.isWorker + hr + ul.pop-over-list + li + a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") + i.fa.fa-clone + | {{_ 'templates'}} unless isSandstorm hr ul.pop-over-list @@ -109,13 +110,15 @@ template(name="changeSettingsPopup") | {{_ 'show-desktop-drag-handles'}} if showDesktopDragHandles i.fa.fa-check - li - label.bold - i.fa.fa-sort-numeric-asc - | {{_ 'show-cards-minimum-count'}} - input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false") - input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}") + unless currentUser.isWorker + li + label.bold + i.fa.fa-sort-numeric-asc + | {{_ 'show-cards-minimum-count'}} + input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false") + input.js-apply-show-cards-at.left(type="submit" value="{{_ 'apply'}}") template(name="userDeletePopup") - p {{_ 'delete-user-confirm-popup'}} - button.js-confirm.negate.full(type="submit") {{_ 'delete'}} + unless currentUser.isWorker + p {{_ 'delete-user-confirm-popup'}} + button.js-confirm.negate.full(type="submit") {{_ 'delete'}} |