From c61b75c47a93755fa3cbc41a095094c23b9f9df7 Mon Sep 17 00:00:00 2001
From: Daniel Y <d1098abc@gmail.com>
Date: Sat, 18 Oct 2014 04:04:53 +0800
Subject: [PATCH 1/2] Dashboard list for "Entries under Review"

---
 client/source/controllers/buckets_controller.coffee | 12 +++++++++++-
 client/source/routes.coffee                         |  1 +
 client/source/templates/layouts/loggedin.hbs        |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/source/controllers/buckets_controller.coffee b/client/source/controllers/buckets_controller.coffee
index 1ff6e4a..4311a50 100644
--- a/client/source/controllers/buckets_controller.coffee
+++ b/client/source/controllers/buckets_controller.coffee
@@ -39,9 +39,19 @@ module.exports = class BucketsController extends Controller
       model: newBucket
       fields: @newFields
 
+  review: ->
+
+    reviewBucket = new Bucket
+    reviewBucket.set('name','Entries under Review')
+    @entries = new Entries
+    @entries.fetch( data: { status: 'draft'} )
+
+    @view = new EntriesBrowser
+     collection: @entries
+     bucket: reviewBucket
+
   browse: (params) ->
     bucket = mediator.buckets?.findWhere slug: params.slug
-
     return @bucketNotFound() unless bucket
 
     if params.add
diff --git a/client/source/routes.coffee b/client/source/routes.coffee
index f3a4dd6..131e799 100644
--- a/client/source/routes.coffee
+++ b/client/source/routes.coffee
@@ -13,6 +13,7 @@ module.exports = (match) ->
   match 'reset/:token', 'auth#resetPassword', params: authRequired: no
 
   match 'buckets/add', 'buckets#add'
+  match 'buckets/review', 'buckets#review'
   match 'buckets/:slug', 'buckets#browse'
   match 'buckets/:slug/add', 'buckets#browse', params: add: yes
   match 'buckets/:slug/fields', 'buckets#editFields'
diff --git a/client/source/templates/layouts/loggedin.hbs b/client/source/templates/layouts/loggedin.hbs
index f4ab091..711185d 100644
--- a/client/source/templates/layouts/loggedin.hbs
+++ b/client/source/templates/layouts/loggedin.hbs
@@ -24,6 +24,7 @@
           {{/each}}
           {{#hasRole 'administrator'}}
             <li><a href="/{{adminSegment}}/buckets/add">{{icon 'add'}} New Bucket</a></li>
+            <li><a href="/{{adminSegment}}/buckets/review">{{icon 'add'}} Review Entries</a></li>
           {{/hasRole}}
 
           {{#hasRole 'administrator'}}

From 768abf7e14724b5d92479fb6415ba10d14f4f700 Mon Sep 17 00:00:00 2001
From: Daniel Y <d1098abc@gmail.com>
Date: Tue, 21 Oct 2014 12:42:29 +0800
Subject: [PATCH 2/2] Only display pending entries in review dashboard that
 user is an editor for

---
 client/source/controllers/buckets_controller.coffee | 7 +++++--
 client/source/templates/layouts/loggedin.hbs        | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/source/controllers/buckets_controller.coffee b/client/source/controllers/buckets_controller.coffee
index 4311a50..e02c30d 100644
--- a/client/source/controllers/buckets_controller.coffee
+++ b/client/source/controllers/buckets_controller.coffee
@@ -40,11 +40,14 @@ module.exports = class BucketsController extends Controller
       fields: @newFields
 
   review: ->
+    @entries = new Entries
+    
+    for role, i in mediator.user.get('roles')
+      currentBucket = mediator.buckets?.findWhere id: role.resourceId
+      @entries.fetch( data: { bucket: currentBucket.get('slug'), status: 'pending', add : true})
 
     reviewBucket = new Bucket
     reviewBucket.set('name','Entries under Review')
-    @entries = new Entries
-    @entries.fetch( data: { status: 'draft'} )
 
     @view = new EntriesBrowser
      collection: @entries
diff --git a/client/source/templates/layouts/loggedin.hbs b/client/source/templates/layouts/loggedin.hbs
index 711185d..6fec7a0 100644
--- a/client/source/templates/layouts/loggedin.hbs
+++ b/client/source/templates/layouts/loggedin.hbs
@@ -24,9 +24,8 @@
           {{/each}}
           {{#hasRole 'administrator'}}
             <li><a href="/{{adminSegment}}/buckets/add">{{icon 'add'}} New Bucket</a></li>
-            <li><a href="/{{adminSegment}}/buckets/review">{{icon 'add'}} Review Entries</a></li>
           {{/hasRole}}
-
+          <li><a href="/{{adminSegment}}/buckets/review">{{icon 'add'}} Review Entries</a></li>
           {{#hasRole 'administrator'}}
             <li class="divider"></li>
             <li><a href="/{{adminSegment}}/routes">{{icon 'direction-sign'}} Routes</a></li>