From fa9bd84c24fd311e6a781fe984830d12590b96d9 Mon Sep 17 00:00:00 2001 From: Daniel Barreto Date: Wed, 4 Feb 2015 17:45:06 -0500 Subject: [PATCH] Fix admin view show only users in queue who have not been accepted or rejected by an admin - refs BT#9092 --- .../src/AdvancedSubscriptionPlugin.class.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.class.php b/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.class.php index b8556ae859..a164c860ca 100644 --- a/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.class.php +++ b/plugin/advancedsubscription/src/AdvancedSubscriptionPlugin.class.php @@ -793,7 +793,16 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface $queueTable = Database::get_main_table(TABLE_ADV_SUB_QUEUE); $userTable = Database::get_main_table(TABLE_MAIN_USER); $userJoinTable = $queueTable . ' q INNER JOIN ' . $userTable . ' u ON q.user_id = u.user_id'; - $where = array('where' => array('session_id = ?' => $sessionId)); + $where = array( + 'where' => + array( + 'q.session_id = ? AND q.status <> ? AND q.status <> ?' => array( + $sessionId, + ADV_SUB_QUEUE_STATUS_ADMIN_APPROVED, + ADV_SUB_QUEUE_STATUS_ADMIN_DISAPPROVED, + ) + ) + ); $select = 'u.user_id, u.firstname, u.lastname, q.created_at, q.updated_at, q.status, q.id as queue_id'; $students = Database::select($select, $userJoinTable, $where); foreach ($students as &$student) {