Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-14 19:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: properly allow values in res.locals.templateValues to be added to the template data

Browse Source
This commit is contained in:
Julian Lam
2023-01-20 16:23:14 -05:00
parent f2ae45838e
commit dee3b0d4c5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/middleware/render.js
View File

@@ -107,7 +107,7 @@ module.exports = function (middleware) {
}
try {
await renderMethod(template, options, fn);
await renderMethod(template, { ...res.locals.templateValues, ...options }, fn);
} catch (err) {
next(err);
}
@@ -144,7 +144,6 @@ module.exports = function (middleware) {
relative_path,
bodyClass: options.bodyClass,
widgets: options.widgets,
...(res.locals.templateValues || {}),
};
templateValues.configJSON = jsesc(JSON.stringify(res.locals.config), { isScriptContext: true });
@@ -277,7 +276,6 @@ module.exports = function (middleware) {
latestVersion: results.latestVersion,
upgradeAvailable: results.latestVersion && semver.gt(results.latestVersion, version),
showManageMenu: results.privileges.superadmin || ['categories', 'privileges', 'users', 'admins-mods', 'groups', 'tags', 'settings'].some(priv => results.privileges[`admin:${priv}`]),
...(res.locals.templateValues || {}),
};
templateValues.template = { name: res.locals.template };