Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 02:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: spec

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-11-18 23:24:51 -05:00
parent e9585b9be2
commit 8d060065a0
6 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/openapi/components/schemas/GroupObject.yaml
View File

@@ -14,6 +14,9 @@ GroupFullObject:
userTitle:
type: number
description: Label text for the user badge
userTitleEscaped:
type: number
description: Same as userTitle but with translation tokens escaped, used to display raw userTitle in group management
userTitleEnabled:
type: number
description:
@@ -122,6 +125,9 @@ GroupDataObject:
userTitle:
type: number
description: Label text for the user badge
userTitleEscaped:
type: number
description: Same as userTitle but with translation tokens escaped, used to display raw userTitle in group management
userTitleEnabled:
type: number
description:

2
public/openapi/read/admin/manage/groups.yaml
View File

@@ -30,6 +30,8 @@ get:
type: number
userTitle:
type: string
userTitleEscaped:
type: string
icon:
type: string
labelColor:

2
public/openapi/read/groups.yaml
View File

@@ -26,6 +26,8 @@ get:
type: number
userTitle:
type: string
userTitleEscaped:
type: string
icon:
type: string
labelColor:

3
src/controllers/admin/groups.js
View File

@@ -10,7 +10,6 @@ const groups = require('../../groups');
const meta = require('../../meta');
const pagination = require('../../pagination');
const events = require('../../events');
const translator = require('../../translator');
const groupsController = module.exports;
@@ -46,7 +45,7 @@ groupsController.get = async function (req, res, next) {
return next();
}
group.isOwner = true;
group.userTitleEscaped = translator.escape(group.userTitle);
const groupNameData = groupNames.map(function (name) {
return {
encodedName: encodeURIComponent(name),

3
src/controllers/groups.js
View File

@@ -9,7 +9,6 @@ const user = require('../user');
const helpers = require('./helpers');
const pagination = require('../pagination');
const privileges = require('../privileges');
const translator = require('../translator');
const groupsController = module.exports;
@@ -73,7 +72,7 @@ groupsController.details = async function (req, res, next) {
return next();
}
groupData.isOwner = groupData.isOwner || isAdmin || (isGlobalMod && !groupData.system);
groupData.userTitleEscaped = translator.escape(groupData.userTitle);
res.render('groups/details', {
title: '[[pages:group, ' + groupData.displayName + ']]',
group: groupData,

2
src/groups/data.js
View File

@@ -6,6 +6,7 @@ const nconf = require('nconf');
const db = require('../database');
const plugins = require('../plugins');
const utils = require('../utils');
const translator = require('../translator');
const intFields = [
'createtime', 'memberCount', 'hidden', 'system', 'private',
@@ -101,5 +102,6 @@ function escapeGroupData(group) {
group.displayName = validator.escape(String(group.name));
group.description = validator.escape(String(group.description || ''));
group.userTitle = validator.escape(String(group.userTitle || ''));
group.userTitleEscaped = translator.escape(group.userTitle);
}
}