Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-05 05:07:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove meta/title.js and meta.title.build #3481

Browse Source
This commit is contained in:
barisusakli
2015-08-26 15:54:54 -04:00
parent 098c56a106
commit eaefd9d24c
18 changed files with 89 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/middleware/admin.js
View File

@@ -52,7 +52,7 @@ middleware.buildHeader = function(req, res, next) {
});
};
middleware.renderHeader = function(req, res, next) {
middleware.renderHeader = function(req, res, data, next) {
var custom_header = {
'plugins': [],
'authentication': []
@@ -92,7 +92,7 @@ middleware.renderHeader = function(req, res, next) {
}
res.locals.config = results.config;
var data = {
var templateValues = {
relative_path: nconf.get('relative_path'),
configJSON: JSON.stringify(results.config),
user: userData,
@@ -104,10 +104,10 @@ middleware.renderHeader = function(req, res, next) {
env: process.env.NODE_ENV ? true : false,
};
data.template = {name: res.locals.template};
data.template[res.locals.template] = true;
templateValues.template = {name: res.locals.template};
templateValues.template[res.locals.template] = true;
app.render('admin/header', data, next);
app.render('admin/header', templateValues, next);
});
});
};

38
src/middleware/middleware.js
View File

@@ -68,7 +68,7 @@ middleware.pageView = function(req, res, next) {
middleware.pluginHooks = function(req, res, next) {
async.each(plugins.loadedHooks['filter:router.page'] || [], function(hookObj, next) {
hookObj.method(req, res, next)
hookObj.method(req, res, next);
}, function(req, res) {
// If it got here, then none of the subscribed hooks did anything, or there were no hooks
next();
@@ -143,12 +143,12 @@ middleware.checkAccountPermissions = function(req, res, next) {
}
user.isAdministrator(req.uid, next);
}
}
], function (err, allowed) {
if (err || allowed) {
return next(err);
}
controllers.helpers.notAllowed(req, res);
controllers.helpers.notAllowed(req, res);
});
};
@@ -202,7 +202,7 @@ middleware.buildHeader = function(req, res, next) {
});
};
middleware.renderHeader = function(req, res, callback) {
middleware.renderHeader = function(req, res, data, callback) {
var registrationType = meta.config.registrationType || 'normal';
var templateValues = {
bootswatchCSS: meta.config['theme:src'],
@@ -237,23 +237,18 @@ middleware.renderHeader = function(req, res, callback) {
templateValues.useCustomJS = parseInt(meta.config.useCustomJS, 10) === 1;
next(null, templateValues.useCustomJS ? meta.config.customJS : '');
},
title: function(next) {
settings: function(next) {
if (req.uid) {
user.getSettings(req.uid, function(err, settings) {
if (err) {
return next(err);
}
if (settings.bootswatchSkin && settings.bootswatchSkin !== 'default') {
templateValues.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + settings.bootswatchSkin + '/bootstrap.min.css';
}
meta.title.build(req.url.slice(1), settings.userLang, next);
});
user.getSettings(req.uid, next);
} else {
meta.title.build(req.url.slice(1), meta.config.defaultLang, next);
next();
}
},
title: function(next) {
var title = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB');
title = data.title ? (data.title + ' | ' + title) : title;
next(null, title);
},
isAdmin: function(next) {
user.isAdministrator(req.uid, next);
},
@@ -280,13 +275,16 @@ middleware.renderHeader = function(req, res, callback) {
if (results.user && parseInt(results.user.banned, 10) === 1) {
req.logout();
res.redirect('/');
return;
return res.redirect('/');
}
results.user.isAdmin = results.isAdmin || false;
results.user.uid = parseInt(results.user.uid, 10);
results.user['email:confirmed'] = parseInt(results.user['email:confirmed'], 10) === 1;
if (results.settings && results.settings.bootswatchSkin && results.settings.bootswatchSkin !== 'default') {
templateValues.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + settings.bootswatchSkin + '/bootstrap.min.css';
}
templateValues.browserTitle = results.title;
templateValues.navigation = results.navigation;
templateValues.metaTags = results.tags.meta;
@@ -364,7 +362,7 @@ middleware.processRender = function(req, res, next) {
if (res.locals.renderHeader || res.locals.renderAdminHeader) {
var method = res.locals.renderHeader ? middleware.renderHeader : middleware.admin.renderHeader;
method(req, res, function(err, template) {
method(req, res, options, function(err, template) {
if (err) {
return fn(err);
}