svn commit: r237564 - user/des/fbce/lib/FBCE/Controller

[Dag-Erling Smorgrav]

Author: des
Date: Mon Jun 25 17:12:51 2012
New Revision: 237564
URL: http://svn.freebsd.org/changeset/base/237564

Log:
  - When generating the list of voters for the admin and result pages, make
    sure to only include voters.  The list is not really needed, just the
    count, but this is the minimum fix.
  
  - Sort tied candidates by login.
  
  - While there, use _rs everywhere.

Modified:
  user/des/fbce/lib/FBCE/Controller/Admin.pm
  user/des/fbce/lib/FBCE/Controller/Result.pm

Modified: user/des/fbce/lib/FBCE/Controller/Admin.pm
==============================================================================
--- user/des/fbce/lib/FBCE/Controller/Admin.pm	Mon Jun 25 16:52:27 2012	(r237563)
+++ user/des/fbce/lib/FBCE/Controller/Admin.pm	Mon Jun 25 17:12:51 2012	(r237564)
@@ -30,14 +30,14 @@ sub index :Path :Args(0) {
 	$c->detach();
     }
     my $voters = $c->model('FBCE::Person')->
-	search(undef, { order_by => 'login' });
+	search_rs({ active => 1 }, { order_by => 'login' });
     my $candidates = $c->model('FBCE::Statement')->
-	search_related('person', {}, { order_by => 'login' });
+	search_related_rs('person', {}, { order_by => 'login' });
     my $voted = $c->model('FBCE::Vote')->
-	search_related('voter', {}, { distinct => 1 });
+	search_related_rs('voter', {}, { distinct => 1 });
     my $votes = $c->model('FBCE::Vote');
     my $results = $c->model('FBCE::Result')->
-	search(undef, { order_by => { -desc => 'votes' } });
+	search_rs(undef, { order_by => [ { -desc => 'votes' }, { -asc => 'login' } ] });
     $c->stash(voters => $voters);
     $c->stash(candidates => $candidates);
     $c->stash(voted => $voted);

Modified: user/des/fbce/lib/FBCE/Controller/Result.pm
==============================================================================
--- user/des/fbce/lib/FBCE/Controller/Result.pm	Mon Jun 25 16:52:27 2012	(r237563)
+++ user/des/fbce/lib/FBCE/Controller/Result.pm	Mon Jun 25 17:12:51 2012	(r237564)
@@ -25,15 +25,15 @@ sub index :Path :Args(0) {
     my ($self, $c) = @_;
 
     $c->stash(voters => $c->model('FBCE::Person')->
-	      search_rs(undef, { order_by => 'login' }));
+	      search_rs({ active => 1 }, { order_by => 'login' }));
     $c->stash(candidates => $c->model('FBCE::Statement')->
-	      search_related('person', {}, { order_by => 'login' }));
+	      search_related_rs('person', {}, { order_by => 'login' }));
     if ($c->stash->{'announced'}) {
 	$c->stash(voted => $c->model('FBCE::Vote')->
-		  search_related('voter', {}, { distinct => 1 })->count);
+		  search_related_rs('voter', {}, { distinct => 1 })->count);
 	$c->stash(votes => $c->model('FBCE::Vote')->count);
 	$c->stash(results => $c->model('FBCE::Result')->
-		  search_rs(undef, { order_by => { -desc => 'votes' } }));
+		  search_rs(undef, { order_by => [ { -desc => 'votes' }, { -asc => 'login' } ] }));
     } else {
 	$c->stash(voted => 0, votes => 0, results => undef);
     }