Skip to content

Commit 9ae99a4

Browse files
committed
Implement filtering for status and email_confirmed
1 parent 9ec1838 commit 9ae99a4

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

core/db.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,19 @@ exports.getEntries = function(filter, callback){
6666
}
6767

6868
if (filter['profileImage'] === 1) {
69-
sql += (filter['active'] === 1 ? ' AND' : ' WHERE') + ' image != \'\'';
69+
sql += (sql.includes('WHERE') ? ' AND' : ' WHERE') + ' image != \'\'';
70+
}
71+
72+
if (filter['confirmed'] === 'yes') {
73+
sql += (sql.includes('WHERE') ? ' AND' : ' WHERE') + ' email_confirmed = 1';
74+
} else if (filter['confirmed'] === 'no') {
75+
sql += (sql.includes('WHERE') ? ' AND' : ' WHERE') + ' email_confirmed = 0';
76+
}
77+
78+
if (filter['status'] === 'active' && filter['active'] !== 1) {
79+
sql += (sql.includes('WHERE') ? ' AND' : ' WHERE') + ' status = 1';
80+
} else if (filter['status'] === 'inactive' && filter['active'] !== 1) {
81+
sql += (sql.includes('WHERE') ? ' AND' : ' WHERE') + ' status = 0';
7082
}
7183

7284
let orderBy = filter['orderBy'] ? filter['orderBy'] : 'id';

core/entryController.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ exports.getAll = function(req, res) {
2929
filter['offset'] = parseInt(req.query.offset) || 0;
3030
filter['active'] = parseInt(req.query.isActive) === 0 ? 0 : 1;
3131
filter['profileImage'] = parseInt(req.query.profileImage) || 0;
32+
filter['confirmed'] = req.query.confirmed === 'yes' || req.query.confirmed === 'no' ? req.query.confirmed : 'all';
33+
filter['status'] = req.query.status === 'active' || req.query.status === 'inactive' ? req.query.status : 'all';
3234

3335
// 'orderBy' && 'order' are parameters from the WP admin backend for ordering the entries list
3436
if (req.query.orderBy && orderByAcceptedAttributes.includes(req.query.orderBy)) {

0 commit comments

Comments
 (0)