issue #72

Corrected ban user function. Now removes votes and candidates
everyvote · Mar 10, 2013 · 4eda934 · 4eda934
1 parent 4950885
commit 4eda934
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/app/Controller/CandidatesController.php b/app/Controller/CandidatesController.php
@@ -163,6 +163,8 @@ public function listByElection($id, $filter = 0, $sorting = 0) {
 
         if (empty($blockedUsers)) :
             $blockedUsers[] = 0;
+        else :
+            $conditions[] = array('Candidate.user_id NOT' => $blockedUsers);
         endif;
 
         $moderators = array();
@@ -185,12 +187,10 @@ public function listByElection($id, $filter = 0, $sorting = 0) {
             $order = array('User.name');
         endif;
 
-		// If the sort flag is set to 5, then have the model sort randomly.
-		if ($sorting == '5'):
-
-			$order = array('rand()');
-
-		endif;
+	// If the sort flag is set to 5, then have the model sort randomly.
+	if ($sorting == '5'):
+            $order = array('rand()');
+        endif;
 
         foreach ($this->Candidate->find('all', array('conditions' => $conditions, 'order' => $order)) as $candidate) {
             $votes = array('Votes' => array(