Merge pull request #2991 from LokeshN/deactivate-settings

Issue #2960 - deactivate settings.json
This commit is contained in:
John McLear 2016-06-13 14:41:30 +08:00 committed by GitHub
commit b3b17c2190
6 changed files with 35 additions and 2 deletions

View file

@ -30,7 +30,13 @@ exports.socketio = function (hook_name, args, cb) {
}
else
{
socket.emit("settings", {results: data});
//if showSettingsInAdminPage is set to false, then return NOT_ALLOWED in the result
if(settings.showSettingsInAdminPage === false) {
socket.emit("settings", {results:'NOT_ALLOWED'});
}
else {
socket.emit("settings", {results: data});
}
}
});
});