mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-05-07 10:06:52 +02:00
fix: closes #14133, don't modify displayName for system groups
added a helper to just modify it for front end
This commit is contained in:
@@ -108,10 +108,10 @@
|
|||||||
"nodebb-plugin-spam-be-gone": "2.3.2",
|
"nodebb-plugin-spam-be-gone": "2.3.2",
|
||||||
"nodebb-plugin-web-push": "0.7.7",
|
"nodebb-plugin-web-push": "0.7.7",
|
||||||
"nodebb-rewards-essentials": "1.0.2",
|
"nodebb-rewards-essentials": "1.0.2",
|
||||||
"nodebb-theme-harmony": "2.2.62",
|
"nodebb-theme-harmony": "2.2.63",
|
||||||
"nodebb-theme-lavender": "7.1.21",
|
"nodebb-theme-lavender": "7.1.21",
|
||||||
"nodebb-theme-peace": "2.2.57",
|
"nodebb-theme-peace": "2.2.58",
|
||||||
"nodebb-theme-persona": "14.2.33",
|
"nodebb-theme-persona": "14.2.34",
|
||||||
"nodebb-widget-essentials": "7.0.43",
|
"nodebb-widget-essentials": "7.0.43",
|
||||||
"nodemailer": "8.0.3",
|
"nodemailer": "8.0.3",
|
||||||
"nprogress": "0.2.0",
|
"nprogress": "0.2.0",
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ module.exports = function (utils, Benchpress, relative_path) {
|
|||||||
generateCategoryBackground,
|
generateCategoryBackground,
|
||||||
generateChildrenCategories,
|
generateChildrenCategories,
|
||||||
generateTopicClass,
|
generateTopicClass,
|
||||||
|
generateGroupDisplayName,
|
||||||
membershipBtn,
|
membershipBtn,
|
||||||
spawnPrivilegeStates,
|
spawnPrivilegeStates,
|
||||||
localeToHTML,
|
localeToHTML,
|
||||||
@@ -167,6 +168,10 @@ module.exports = function (utils, Benchpress, relative_path) {
|
|||||||
return fields.filter(field => !!topic[field]).join(' ');
|
return fields.filter(field => !!topic[field]).join(' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function generateGroupDisplayName(group) {
|
||||||
|
return group.system ? group.displayName.replace(/-/g, ' ') : group.displayName;
|
||||||
|
}
|
||||||
|
|
||||||
// Groups helpers
|
// Groups helpers
|
||||||
function membershipBtn(groupObj, btnClass = '') {
|
function membershipBtn(groupObj, btnClass = '') {
|
||||||
if (groupObj.isMember && groupObj.name !== 'administrators') {
|
if (groupObj.isMember && groupObj.name !== 'administrators') {
|
||||||
|
|||||||
@@ -133,9 +133,6 @@ module.exports = function (Groups) {
|
|||||||
if (hasField('name')) {
|
if (hasField('name')) {
|
||||||
group.nameEncoded = encodeURIComponent(group.name);
|
group.nameEncoded = encodeURIComponent(group.name);
|
||||||
group.displayName = validator.escape(String(group.name));
|
group.displayName = validator.escape(String(group.name));
|
||||||
if (Groups.systemGroups.includes(group.name)) {
|
|
||||||
group.displayName = group.displayName.replace(/-/g, ' ');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (hasField('description')) {
|
if (hasField('description')) {
|
||||||
group.description = validator.escape(String(group.description || ''));
|
group.description = validator.escape(String(group.description || ''));
|
||||||
|
|||||||
Reference in New Issue
Block a user