Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-24 01:10:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

multiple plugins pointing to admin can conflict - fix

Browse Source
This commit is contained in:
psychobunny
2013-11-04 23:59:33 -05:00
parent 41f98d29b7
commit 1d6135150f
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/routes/admin.js
View File

@@ -141,13 +141,16 @@ var user = require('./../user.js'),
for (var route in routes) { for (var route in routes) {
if (routes.hasOwnProperty(route)) { if (routes.hasOwnProperty(route)) {
app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) { (function(route) {
routes[route].options(req, res, function(options) { console.log(routes[route]);
Admin.build_header(res, function (err, header) { app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) {
res.send(header + options.content + templates['admin/footer']); routes[route].options(req, res, function(options) {
Admin.build_header(res, function (err, header) {
res.send(header + options.content + templates['admin/footer']);
});
}); });
}); });
}); }(route));
} }
} }
}); });

20
src/webserver.js
View File

@@ -706,16 +706,18 @@ var express = require('express'),
var routes = custom_routes.routes; var routes = custom_routes.routes;
for (var route in routes) { for (var route in routes) {
if (routes.hasOwnProperty(route)) { if (routes.hasOwnProperty(route)) {
app[routes[route].method || 'get'](routes[route].route, function(req, res) { (function(route) {
routes[route].options(req, res, function(options) { app[routes[route].method || 'get'](routes[route].route, function(req, res) {
app.build_header({ routes[route].options(req, res, function(options) {
req: options.req, app.build_header({
res: options.res req: options.req,
}, function (err, header) { res: options.res
res.send(header + options.content + templates['footer']); }, function (err, header) {
res.send(header + options.content + templates['footer']);
});
}); });
}); });
}); }(route));
} }
} }
}); });
@@ -726,4 +728,4 @@ var express = require('express'),
}(WebServer)); }(WebServer));
global.server = server; global.server = server;