diff options
author | LokeshN <ln@vmware.com> | 2016-05-22 20:58:51 +0530 |
---|---|---|
committer | LokeshN <ln@vmware.com> | 2016-05-22 21:12:21 +0530 |
commit | a8d5dc0693504671126abcf8680a3a3aa6acaebb (patch) | |
tree | d7bae50c226909d6897b10e8b8ae515839ae7c08 /src/node | |
parent | c5638dd7e520b26ea6f05e7ca34edaa7b466d62a (diff) | |
download | etherpad-lite-a8d5dc0693504671126abcf8680a3a3aa6acaebb.zip |
Issue #2960 - deactivate settings.json
Deactivate settings.json in Admin dashboard
Diffstat (limited to 'src/node')
-rw-r--r-- | src/node/hooks/express/adminsettings.js | 8 | ||||
-rw-r--r-- | src/node/utils/Settings.js | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/node/hooks/express/adminsettings.js b/src/node/hooks/express/adminsettings.js index 4986f093..73691837 100644 --- a/src/node/hooks/express/adminsettings.js +++ b/src/node/hooks/express/adminsettings.js @@ -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}); + } } }); }); diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index b765670a..24bc25c3 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -209,6 +209,11 @@ exports.requireAuthentication = false; exports.requireAuthorization = false; exports.users = {}; +/* +* Show settings in admin page, by default it is true +*/ +exports.showSettingsInAdminPage = true; + //checks if abiword is avaiable exports.abiwordAvailable = function() { |