frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.18.5

Browse Source
This commit is contained in:
Nick O'Leary
2018-05-10 21:45:25 +01:00
parent b22956bd99 4fdd09a262
commit 0c7f4e2168
69 changed files with 2396 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
red/runtime-api/settings.js
View File

@@ -68,10 +68,17 @@ var api = module.exports = {
try {
var safeSettings = {
httpNodeRoot: runtime.settings.httpNodeRoot||"/",
version: runtime.settings.version,
user: opts.user
version: runtime.settings.version
}
if (opts.user) {
safeSettings.user = {}
var props = ["anonymous","username","image","permissions"];
props.forEach(prop => {
if (opts.user.hasOwnProperty(prop)) {
safeSettings.user[prop] = opts.user[prop];
}
})
}
if (util.isArray(runtime.settings.paletteCategories)) {
safeSettings.paletteCategories = runtime.settings.paletteCategories;
}