From 75af97814596e9ab749f480cf0590cb37c6e0112 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Tue, 22 Sep 2015 17:13:05 -0400 Subject: [PATCH] closes #3646 --- public/src/admin/admin.js | 16 ---------------- src/middleware/admin.js | 4 ++++ src/socket.io/admin.js | 4 ---- src/views/admin/header.tpl | 3 ++- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index a601893e85..0309fb48fd 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -26,22 +26,6 @@ configureSlidemenu(); }); - socket.emit('admin.config.get', function(err, config) { - if(err) { - return app.alert({ - alert_id: 'config_status', - timeout: 2500, - title: 'Error', - message: 'NodeBB encountered a problem getting config: ' + err.message, - type: 'danger' - }); - } - - // move this to admin.config - app.config = config; - $(window).trigger('action:config.loaded'); - }); - function setupKeybindings() { Mousetrap.bind('ctrl+shift+a r', function() { require(['admin/modules/instance'], function(instance) { diff --git a/src/middleware/admin.js b/src/middleware/admin.js index db4116adc6..0dd81dc8fe 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -85,6 +85,9 @@ middleware.renderHeader = function(req, res, data, next) { }, config: function(next) { controllers.api.getConfig(req, res, next); + }, + configs: function(next) { + meta.configs.list(next); } }, function(err, results) { if (err) { @@ -96,6 +99,7 @@ middleware.renderHeader = function(req, res, data, next) { config: results.config, configJSON: JSON.stringify(results.config), relative_path: results.config.relative_path, + adminConfigJSON: encodeURIComponent(JSON.stringify(results.configs)), user: userData, userJSON: JSON.stringify(userData).replace(/'/g, "\\'"), plugins: results.custom_header.plugins, diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index c7cd282697..77df65467c 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -134,10 +134,6 @@ SocketAdmin.widgets.set = function(socket, data, callback) { widgets.setArea(data, callback); }; -SocketAdmin.config.get = function(socket, data, callback) { - meta.configs.list(callback); -}; - SocketAdmin.config.set = function(socket, data, callback) { if(!data) { return callback(new Error('[[error:invalid-data]]')); diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 7f46d9252d..5839dcb254 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -14,7 +14,8 @@ var config = JSON.parse('{{configJSON}}'); var app = { template: "{template.name}", - user: JSON.parse('{{userJSON}}') + user: JSON.parse('{{userJSON}}'), + config: JSON.parse(decodeURIComponent('{{adminConfigJSON}}')) };