From 9af55ebae79a789818033c209229a21efd06572e Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Fri, 18 May 2012 15:58:25 +0100 Subject: [PATCH] Now render history with all bins --- lib/handlers.js | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/lib/handlers.js b/lib/handlers.js index 4669cf86..0718a433 100644 --- a/lib/handlers.js +++ b/lib/handlers.js @@ -147,20 +147,34 @@ module.exports = handlers = { var template = handlers.templateFromBin(bin), jsbin = handlers.jsbin(bin, req.helpers.production ? req.helpers.set('version') : 'debug', req.session._csrf); - req.helpers.analytics(function (err, analytics) { - res.render('index', { - tips: '{}', - revision: bin.revision || 1, - home: req.session.user ? req.session.user.name : null, - jsbin: JSON.stringify(jsbin), - json_template: JSON.stringify(template), - version: jsbin.version, - analytics: analytics, - token: req.session._csrf, - url: req.path, - 'production?': req.helpers.production + function onComplete(err, history) { + req.helpers.analytics(function (err, analytics) { + res.render('index', { + tips: '{}', + revision: bin.revision || 1, + home: req.session.user ? req.session.user.name : null, + jsbin: JSON.stringify(jsbin), + json_template: JSON.stringify(template), + version: jsbin.version, + analytics: analytics, + token: req.session._csrf, + url: req.path, + list_history: history || '', + 'production?': req.helpers.production + }); }); - }); + } + + if (req.session.user) { + req.models.user.getBins(req.session.user.name, function (err, bins) { + if (err) { + return onComplete(err); + } + handlers.formatHistory(bins, req.helpers, onComplete); + }); + } else { + onComplete(); + } }, renderFiles: function (req, res, files) { files = files || handlers.defaultFiles();