From 62a38c1695ccfdb9697cf8a81cc032ecc05a8e70 Mon Sep 17 00:00:00 2001 From: Andrew Davidson Date: Sat, 23 Jan 2016 17:47:15 -0500 Subject: [PATCH] Adding view to see things staged for upload. --- app.js | 15 +++++++++++++++ post.js | 6 +++--- views/admin-view-uploads.jade | 25 +++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 views/admin-view-uploads.jade diff --git a/app.js b/app.js index a7d0096..3cfe921 100644 --- a/app.js +++ b/app.js @@ -101,6 +101,21 @@ app.get('/logout', function(req, res) { } ); +// Admin page to view all the items that need to be uploaded. +app.get('/admin/view/uploads', + function(req, res, next) { + Post.getNeedsUpload(function (err, posts) { + if (err) console.log(err); + res.render('admin-view-uploads', { + successNotice: req.flash('successNotice'), + failureNotice: req.flash('failureNotice'), + posts: posts, + user: req.user + }); + }); + } +); + // Admin dashboard page. app.get('/admin', function(req, res, next) { diff --git a/post.js b/post.js index 323dc95..9ae906b 100644 --- a/post.js +++ b/post.js @@ -269,9 +269,9 @@ Post.getNeedsGeneration = function (callback) { // Returns: List of Post objects Post.getNeedsUpload = function (callback) { db.collection("posts").find({ - $where: 'this.lastUploadDate < this.updatedDate', - $where: 'this.lastGenerateDate <= this.updatedDate', - $where: 'this.published === "True"' + $where: '(this.lastUploadDate < this.updatedDate) && \ + (this.lastGenerateDate >= this.updatedDate) && \ + this.published' }).toArray( function (err, docs) { if (err) console.log(err); posts = []; diff --git a/views/admin-view-uploads.jade b/views/admin-view-uploads.jade new file mode 100644 index 0000000..acc5de2 --- /dev/null +++ b/views/admin-view-uploads.jade @@ -0,0 +1,25 @@ +extends admin-layout + +block content + div(class="row") + include ./admin-sidebar.jade + + div(class="col-sm-10 col-sm-offset-2 main") + h1(class="page-header") Pending Uploads + + include ./admin-messages.jade + + table(class="table table-striped") + each post in posts + tr + td #{post.get("uuid")} + td: a(href="/admin/post/view/#{post.get('uuid')}") #{post.get("title")} + td #{post.getShortDate()} + td + a(href="/admin/post/edit/#{post.get('uuid')}") Edit + | - + a(href="/admin/post/delete/#{post.get('uuid')}") Delete + | - + a(href="/admin/post/regenerate/#{post.get('uuid')}") Regenerate + | - + a(href="/admin/post/publish/#{post.get('uuid')}") Publish