summaryrefslogtreecommitdiffstats
path: root/client/components/lists
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-01-05 21:28:14 +0200
committerLauri Ojansivu <x@xet7.org>2020-01-05 21:28:14 +0200
commitf6f7705f23ea18d7f1b8f8736b762eb89e00a3cf (patch)
treed1213a62330b38c1a293f39a8b5265deefff0535 /client/components/lists
parent6209b792aa9548ba66691fcaa0033ec9c29a3c7c (diff)
downloadwekan-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/lists')
-rw-r--r--client/components/lists/listBody.js3
-rw-r--r--client/components/lists/listHeader.jade31
-rw-r--r--client/components/lists/listHeader.js7
3 files changed, 23 insertions, 18 deletions
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index b0974705..89c27ec7 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -189,7 +189,8 @@ BlazeComponent.extendComponent({
!this.reachedWipLimit() &&
Meteor.user() &&
Meteor.user().isBoardMember() &&
- !Meteor.user().isCommentOnly()
+ !Meteor.user().isCommentOnly() &&
+ !Meteor.user().isWorker()
);
},
diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade
index 6468839d..ec2c556f 100644
--- a/client/components/lists/listHeader.jade
+++ b/client/components/lists/listHeader.jade
@@ -10,7 +10,7 @@ template(name="listHeader")
a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
h2.list-header-name(
title="{{ moment modifiedAt 'LLL' }}"
- class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}js-open-inlined-form is-editable{{/unless}}{{/if}}")
+ class="{{#if currentUser.isBoardMember}}{{#unless currentUser.isCommentOnly}}{{#unless currentUser.isWorker}}js-open-inlined-form is-editable{{/unless}}{{/unless}}{{/if}}")
+viewer
= title
if wipLimit.enabled
@@ -65,11 +65,12 @@ template(name="listActionPopup")
i.fa.fa-eye-slash
| {{_ 'watch'}}
unless currentUser.isCommentOnly
- ul.pop-over-list
- li
- a.js-set-color-list
- i.fa.fa-paint-brush
- | {{_ 'set-color-list'}}
+ unless currentUser.isWorker
+ ul.pop-over-list
+ li
+ a.js-set-color-list
+ i.fa.fa-paint-brush
+ | {{_ 'set-color-list'}}
ul.pop-over-list
if cards.count
li
@@ -82,13 +83,14 @@ template(name="listActionPopup")
a.js-set-wip-limit
i.fa.fa-ban
| {{#if isWipLimitEnabled }}{{_ 'edit-wip-limit'}}{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}}
- hr
- ul.pop-over-list
- li
- a.js-close-list
- i.fa.fa-arrow-right
- i.fa.fa-archive
- | {{_ 'archive-list'}}
+ unless currentUser.isWorker
+ hr
+ ul.pop-over-list
+ li
+ a.js-close-list
+ i.fa.fa-arrow-right
+ i.fa.fa-archive
+ | {{_ 'archive-list'}}
hr
ul.pop-over-list
li
@@ -114,7 +116,8 @@ template(name="listMorePopup")
input.inline-input(type="text" readonly value="{{ rootUrl }}")
| {{_ 'added'}}
span.date(title=list.createdAt) {{ moment createdAt 'LLL' }}
- a.js-delete {{_ 'delete'}}
+ unless currentUser.isWorker
+ a.js-delete {{_ 'delete'}}
template(name="listDeletePopup")
p {{_ "list-delete-pop"}}
diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js
index 07edade0..46dbd748 100644
--- a/client/components/lists/listHeader.js
+++ b/client/components/lists/listHeader.js
@@ -9,9 +9,10 @@ BlazeComponent.extendComponent({
canSeeAddCard() {
const list = Template.currentData();
return (
- !list.getWipLimit('enabled') ||
- list.getWipLimit('soft') ||
- !this.reachedWipLimit()
+ (!list.getWipLimit('enabled') ||
+ list.getWipLimit('soft') ||
+ !this.reachedWipLimit()) &&
+ !Meteor.user().isWorker()
);
},