Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-29 04:36:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

New Board Permissions: NormalAssignedOnly, CommentAssignedOnly, ReadOnly, ReadAssignedOnly.

Browse source 
Thanks to xet7 !

Fixes #1122,
fixes #6033,
fixes #3300
This commit is contained in:
Lauri Ojansivu 2025-12-22 21:45:09 +02:00
parent 21fb8e9164
commit c1168d181b
5 changed files with 190 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/components/sidebar/sidebar.jade
View file

@ -809,6 +809,12 @@ template(name="changePermissionsPopup")
if isNormal
| ✅
span.sub-name {{_ 'normal-desc'}}
li
a(class="{{#if isLastAdmin}}disabled{{else}}js-set-normal-assigned-only{{/if}}")
| {{_ 'normal-assigned-only'}}
if isNormalAssignedOnly
| ✅
span.sub-name {{_ 'normal-assigned-only-desc'}}
li
a(class="{{#if isLastAdmin}}disabled{{else}}js-set-no-comments{{/if}}")
| {{_ 'no-comments'}}
@ -821,6 +827,24 @@ template(name="changePermissionsPopup")
if isCommentOnly
| ✅
span.sub-name {{_ 'comment-only-desc'}}
li
a(class="{{#if isLastAdmin}}disabled{{else}}js-set-comment-assigned-only{{/if}}")
| {{_ 'comment-assigned-only'}}
if isCommentAssignedOnly
| ✅
span.sub-name {{_ 'comment-assigned-only-desc'}}
li
a(class="{{#if isLastAdmin}}disabled{{else}}js-set-read-only{{/if}}")
| {{_ 'read-only'}}
if isReadOnly
| ✅
span.sub-name {{_ 'read-only-desc'}}
li
a(class="{{#if isLastAdmin}}disabled{{else}}js-set-read-assigned-only{{/if}}")
| {{_ 'read-assigned-only'}}
if isReadAssignedOnly
| ✅
span.sub-name {{_ 'read-assigned-only-desc'}}
li
a(class="{{#if isLastAdmin}}disabled{{else}}js-set-worker{{/if}}")
| {{_ 'worker'}}

64
client/components/sidebar/sidebar.js
View file

@ -239,8 +239,20 @@ Template.memberPopup.helpers({
const commentOnly = currentBoard.hasCommentOnly(this.userId);
const noComments = currentBoard.hasNoComments(this.userId);
const worker = currentBoard.hasWorker(this.userId);
if (commentOnly) {
const normalAssignedOnly = currentBoard.hasNormalAssignedOnly(this.userId);
const commentAssignedOnly = currentBoard.hasCommentAssignedOnly(this.userId);
const readOnly = currentBoard.hasReadOnly(this.userId);
const readAssignedOnly = currentBoard.hasReadAssignedOnly(this.userId);
if (readAssignedOnly) {
return TAPi18n.__('read-assigned-only');
} else if (readOnly) {
return TAPi18n.__('read-only');
} else if (commentAssignedOnly) {
return TAPi18n.__('comment-assigned-only');
} else if (commentOnly) {
return TAPi18n.__('comment-only');
} else if (normalAssignedOnly) {
return TAPi18n.__('normal-assigned-only');
} else if (noComments) {
return TAPi18n.__('no-comments');
} else if (worker) {
@ -1925,7 +1937,7 @@ Template.removeBoardTeamPopup.helpers({
});
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-normal-assigned-only, click .js-set-no-comments, click .js-set-comment-only, click .js-set-comment-assigned-only, click .js-set-read-only, click .js-set-read-assigned-only, click .js-set-worker'(
event,
) {
const currentBoard = Utils.getCurrentBoard();
@ -1934,6 +1946,14 @@ Template.changePermissionsPopup.events({
const isCommentOnly = $(event.currentTarget).hasClass(
'js-set-comment-only',
);
const isNormalAssignedOnly = $(event.currentTarget).hasClass(
'js-set-normal-assigned-only',
);
const isCommentAssignedOnly = $(event.currentTarget).hasClass(
'js-set-comment-assigned-only',
);
const isReadOnly = $(event.currentTarget).hasClass('js-set-read-only');
const isReadAssignedOnly = $(event.currentTarget).hasClass('js-set-read-assigned-only');
const isNoComments = $(event.currentTarget).hasClass('js-set-no-comments');
const isWorker = $(event.currentTarget).hasClass('js-set-worker');
currentBoard.setMemberPermission(
@ -1942,6 +1962,10 @@ Template.changePermissionsPopup.events({
isNoComments,
isCommentOnly,
isWorker,
isNormalAssignedOnly,
isCommentAssignedOnly,
isReadOnly,
isReadAssignedOnly,
);
Popup.back(1);
},
@ -1959,10 +1983,22 @@ Template.changePermissionsPopup.helpers({
!currentBoard.hasAdmin(this.userId) &&
!currentBoard.hasNoComments(this.userId) &&
!currentBoard.hasCommentOnly(this.userId) &&
!currentBoard.hasNormalAssignedOnly(this.userId) &&
!currentBoard.hasCommentAssignedOnly(this.userId) &&
!currentBoard.hasReadOnly(this.userId) &&
!currentBoard.hasReadAssignedOnly(this.userId) &&
!currentBoard.hasWorker(this.userId)
);
},
isNormalAssignedOnly() {
const currentBoard = Utils.getCurrentBoard();
return (
!currentBoard.hasAdmin(this.userId) &&
currentBoard.hasNormalAssignedOnly(this.userId)
);
},
isNoComments() {
const currentBoard = Utils.getCurrentBoard();
return (
@ -1979,6 +2015,30 @@ Template.changePermissionsPopup.helpers({
);
},
isCommentAssignedOnly() {
const currentBoard = Utils.getCurrentBoard();
return (
!currentBoard.hasAdmin(this.userId) &&
currentBoard.hasCommentAssignedOnly(this.userId)
);
},
isReadOnly() {
const currentBoard = Utils.getCurrentBoard();
return (
!currentBoard.hasAdmin(this.userId) &&
currentBoard.hasReadOnly(this.userId)
);
},
isReadAssignedOnly() {
const currentBoard = Utils.getCurrentBoard();
return (
!currentBoard.hasAdmin(this.userId) &&
currentBoard.hasReadAssignedOnly(this.userId)
);
},
isWorker() {
const currentBoard = Utils.getCurrentBoard();
return (