diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-01-03 16:02:31 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-01-03 16:02:31 +0200 |
commit | 27943796ade78ca3c503637a1340918bf06a1267 (patch) | |
tree | f5732aa18b55d49bb3933ddf65613b707329984c /client/components/sidebar/sidebar.js | |
parent | 9b288475928627d76dd7c379caf2b0eede8d9e4a (diff) | |
download | wekan-27943796ade78ca3c503637a1340918bf06a1267.tar.gz wekan-27943796ade78ca3c503637a1340918bf06a1267.tar.bz2 wekan-27943796ade78ca3c503637a1340918bf06a1267.zip |
Revert to Wekan v3.57 version of client and models directories,
removing Worker role temporarily, because Worker role changes
broke saving card.
Thanks to xet7 !
Diffstat (limited to 'client/components/sidebar/sidebar.js')
-rw-r--r-- | client/components/sidebar/sidebar.js | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index e8f38b8c..9d9c597a 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -161,13 +161,10 @@ Template.memberPopup.helpers({ const currentBoard = Boards.findOne(Session.get('currentBoard')); const commentOnly = currentBoard.hasCommentOnly(this.userId); const noComments = currentBoard.hasNoComments(this.userId); - const worker = currentBoard.hasWorker(this.userId); if (commentOnly) { return TAPi18n.__('comment-only').toLowerCase(); } else if (noComments) { return TAPi18n.__('no-comments').toLowerCase(); - } else if (worker) { - return TAPi18n.__('worker').toLowerCase(); } else { return TAPi18n.__(type).toLowerCase(); } @@ -270,14 +267,6 @@ Template.membersWidget.helpers({ const user = Meteor.user(); return user && user.isInvitedTo(Session.get('currentBoard')); }, - isWorker() { - const user = Meteor.user(); - if (user) { - return Meteor.call(Boards.hasWorker(user.memberId)); - } else { - return false; - } - }, }); Template.membersWidget.events({ @@ -655,7 +644,7 @@ BlazeComponent.extendComponent({ }).register('addMemberPopup'); Template.changePermissionsPopup.events({ - 'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only, click .js-set-worker'( + 'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only'( event, ) { const currentBoard = Boards.findOne(Session.get('currentBoard')); @@ -665,13 +654,11 @@ Template.changePermissionsPopup.events({ 'js-set-comment-only', ); const isNoComments = $(event.currentTarget).hasClass('js-set-no-comments'); - const isWorker = $(event.currentTarget).hasClass('js-set-worker'); currentBoard.setMemberPermission( memberId, isAdmin, isNoComments, isCommentOnly, - isWorker, ); Popup.back(1); }, @@ -688,8 +675,7 @@ Template.changePermissionsPopup.helpers({ return ( !currentBoard.hasAdmin(this.userId) && !currentBoard.hasNoComments(this.userId) && - !currentBoard.hasCommentOnly(this.userId) && - !currentBoard.hasWorker(this.userId) + !currentBoard.hasCommentOnly(this.userId) ); }, @@ -709,13 +695,6 @@ Template.changePermissionsPopup.helpers({ ); }, - isWorker() { - const currentBoard = Boards.findOne(Session.get('currentBoard')); - return ( - !currentBoard.hasAdmin(this.userId) && currentBoard.hasWorker(this.userId) - ); - }, - isLastAdmin() { const currentBoard = Boards.findOne(Session.get('currentBoard')); return ( |