From 501eda8593f9a6897c19f9ed8edb46e6b2ab33ca Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Sat, 30 Nov 2013 02:07:29 -0500 Subject: [PATCH] Displays a flash message with an actual error message when foursquare token is not present --- controllers/api.js | 6 +++++- views/api/foursquare.jade | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/controllers/api.js b/controllers/api.js index 4ca59860533..34f83a887b7 100644 --- a/controllers/api.js +++ b/controllers/api.js @@ -41,12 +41,16 @@ exports.foursquare = function(req, res) { }, userCheckins: function(callback) { foursquare.Users.getCheckins('self', null, req.user.tokens.foursquare, function(err, results) { - callback(err, results.checkins.items); + callback(err, results); }); } }, function(err, results) { + if (err) { + req.flash('info', err); + } res.render('api/foursquare', { title: 'Foursquare API', + message: req.flash('info'), user: req.user, trendingVenues: results.trendingVenues, venue: results.venueDetail, diff --git a/views/api/foursquare.jade b/views/api/foursquare.jade index df71c8773b3..c415303f7c4 100644 --- a/views/api/foursquare.jade +++ b/views/api/foursquare.jade @@ -6,8 +6,10 @@ block content i.fa.fa-foursquare | Foursquare API - if !(user.tokens && user.tokens.foursquare) - .alert.alert-warning No Token Found + if !user.tokens.foursquare + .alert.alert-warning + button.close(type='button', data-dismiss='alert', aria-hidden='true') × + p= message a.btn.btn-large.btn-primary(href='/auth/foursquare') i.fa.fa-qrcode.fa-spin | Get Foursquare Token