Merge branch 'master' into js_books

drewbarontini · drewbarontini · commit ce6ad0d952e6 · 2015-08-29T09:29:44.000-04:00
diff --git a/server/routes/admin.js b/server/routes/admin.js
@@ -17,8 +17,8 @@ var debug = require('debug')('JavaScript.com:server');
 
 function ensureAuthenticated(req, res, next) {
   if (req.isAuthenticated()) { return next(); }
-  req.flash('Please log in.');
-  res.redirect('/')
+  req.session.returnTo = '/admin'
+  res.redirect('/news/sign_in')
 }
 
 /* Admin role */
diff --git a/server/routes/feed.js b/server/routes/feed.js
@@ -14,11 +14,7 @@ router.get('/rss', function(req, res, next) {
   };
   Articles.rss(function(news) {
     news.map(function(story){
-      if (story.new){
-        story.link = story.url
-      }else{
-        story.link = "https://javascript.com/news/" + story.slug
-      }
+      story.link = "https://javascript.com/news/" + story.slug
     });
     res.set('Content-Type', 'text/xml');
     res.render('feed/rss', { options: options, news: news });
diff --git a/server/services/articles.js b/server/services/articles.js
@@ -41,7 +41,7 @@ var Articles = {
 
   // Returns all stories that have been approved for RSS feed. Limit: 25
   rss(cb){
-    db.query('SELECT a.news, a.url, a.title, a.slug, a.body, a,published_at FROM articles as a WHERE a.approved = true ORDER BY published_at DESC', [], cb)
+    db.query('SELECT a.news, a.title, a.slug, a.body, a,published_at FROM articles as a WHERE a.approved = true AND a.news = false ORDER BY published_at DESC', [], cb)
   },
 
   // Returns article based on slug

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ var debug = require('debug')('JavaScript.com:server');`
`17`	`17`
`18`	`18`	`function ensureAuthenticated(req, res, next) {`
`19`	`19`	`if (req.isAuthenticated()) { return next(); }`
`20`		`- req.flash('Please log in.');`
`21`		`- res.redirect('/')`
	`20`	`+ req.session.returnTo = '/admin'`
	`21`	`+ res.redirect('/news/sign_in')`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/* Admin role */`