frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Log error if settings unavailable when saving user settings

Browse Source 
Fixes #1645
This commit is contained in:
Nick O'Leary 2018-04-16 15:02:28 +01:00
parent f4c2938b41
commit 52d9578a19
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
red/api/editor/settings.js
View File

@ -88,13 +88,19 @@ module.exports = {
} }
var currentSettings = settings.getUserSettings(username)||{}; var currentSettings = settings.getUserSettings(username)||{};
currentSettings = extend(currentSettings, req.body); currentSettings = extend(currentSettings, req.body);
settings.setUserSettings(username, currentSettings).then(function() { try {
log.audit({event: "settings.update",username:username},req); settings.setUserSettings(username, currentSettings).then(function() {
res.status(204).end(); log.audit({event: "settings.update",username:username},req);
}).catch(function(err) { res.status(204).end();
}).catch(function(err) {
log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()},req);
res.status(400).json({error:err.code||"unexpected_error", message:err.toString()});
});
} catch(err) {
log.warn(log._("settings.user-not-available",{message:log._("settings.not-available")}));
log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()},req); log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()},req);
res.status(400).json({error:err.code||"unexpected_error", message:err.toString()}); res.status(400).json({error:err.code||"unexpected_error", message:err.toString()});
}); }
} }
} }

1
red/runtime/locales/en-US/runtime.json
View File

@ -75,6 +75,7 @@
}, },
"settings": { "settings": {
"user-not-available": "Cannot save user settings: __message__",
"not-available": "Settings not available", "not-available": "Settings not available",
"property-read-only": "Property '__prop__' is read-only" "property-read-only": "Property '__prop__' is read-only"
}, },

3
red/runtime/settings.js
View File

@ -173,6 +173,9 @@ var persistentSettings = {
return clone(userSettings[username]); return clone(userSettings[username]);
}, },
setUserSettings: function(username,settings) { setUserSettings: function(username,settings) {
if (globalSettings === null) {
throw new Error(log._("settings.not-available"));
}
var current = userSettings[username]; var current = userSettings[username];
userSettings[username] = settings; userSettings[username] = settings;
try { try {