Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 16:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into activitypub

Browse Source
This commit is contained in:
Julian Lam
2024-02-26 16:32:45 -05:00
parent 77a3efb43c 22cd80b9db
commit 3d83a1752e
226 changed files with 3214 additions and 2834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/modules/helpers.common.js
View File

@@ -168,7 +168,7 @@ module.exports = function (utils, Benchpress, relative_path) {
if (groupObj.isPending && groupObj.name !== 'administrators') {
return `<button class="btn btn-warning disabled ${btnClass}"><i class="fa fa-clock-o"></i> [[groups:membership.invitation-pending]]</button>`;
} else if (groupObj.isInvited) {
return `<button class="btn btn-link" data-action="rejectInvite" data-group="${groupObj.displayName}">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="${groupObj.name}"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>`;
return `<button class="btn btn-warning" data-action="rejectInvite" data-group="${groupObj.displayName}">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="${groupObj.name}"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>`;
} else if (!groupObj.disableJoinRequests && groupObj.name !== 'administrators') {
return `<button class="btn btn-success" data-action="join" data-group="${groupObj.displayName}"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>`;
}