From ede8da38ba2ce85fb54027e4d068f73a420c5b62 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Thu, 15 Oct 2015 23:43:24 -0700 Subject: [PATCH] Filter unpaid, unapproved and filled jobs Fix missing key in react array --- common/app/routes/Jobs/components/List.jsx | 1 + server/services/job.js | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/app/routes/Jobs/components/List.jsx b/common/app/routes/Jobs/components/List.jsx index 2ba49a064f..368a376294 100644 --- a/common/app/routes/Jobs/components/List.jsx +++ b/common/app/routes/Jobs/components/List.jsx @@ -32,6 +32,7 @@ export default React.createClass({ return ( handleClick(id) }>

diff --git a/server/services/job.js b/server/services/job.js index 0bbc46db34..a3807a6f28 100644 --- a/server/services/job.js +++ b/server/services/job.js @@ -1,3 +1,11 @@ +const whereFilt = { + where: { + isFilled: false, + isPaid: true, + isApproved: true + } +}; + export default function getJobServices(app) { const { Job } = app.models; @@ -16,7 +24,7 @@ export default function getJobServices(app) { if (id) { return Job.findById(id, cb); } - Job.find({}, (err, jobs) => { + Job.find(whereFilt, (err, jobs) => { cb(err, jobs); }); }