From owner-svn-src-user@FreeBSD.ORG  Mon Jun 25 17:12:52 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8E06A106566B;
	Mon, 25 Jun 2012 17:12:52 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 603D78FC0A;
	Mon, 25 Jun 2012 17:12:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5PHCqVf085332;
	Mon, 25 Jun 2012 17:12:52 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PHCq75085329;
	Mon, 25 Jun 2012 17:12:52 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201206251712.q5PHCq75085329@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 25 Jun 2012 17:12:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237564 - user/des/fbce/lib/FBCE/Controller
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jun 2012 17:12:52 -0000

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);
     }