From owner-svn-src-user@FreeBSD.ORG  Wed May 30 00:57:04 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 239231065672;
	Wed, 30 May 2012 00:57:04 +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 0FFE78FC15;
	Wed, 30 May 2012 00:57:04 +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 q4U0v3qH015340;
	Wed, 30 May 2012 00:57:03 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4U0v3Jq015338;
	Wed, 30 May 2012 00:57:03 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201205300057.q4U0v3Jq015338@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 30 May 2012 00:57:03 +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: r236271 - 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: Wed, 30 May 2012 00:57:04 -0000

Author: des
Date: Wed May 30 00:57:03 2012
New Revision: 236271
URL: http://svn.freebsd.org/changeset/base/236271

Log:
  Get max_votes from the correct place.  This unbreaks voting.

Modified:
  user/des/fbce/lib/FBCE/Controller/Root.pm

Modified: user/des/fbce/lib/FBCE/Controller/Root.pm
==============================================================================
--- user/des/fbce/lib/FBCE/Controller/Root.pm	Wed May 30 00:56:26 2012	(r236270)
+++ user/des/fbce/lib/FBCE/Controller/Root.pm	Wed May 30 00:57:03 2012	(r236271)
@@ -33,7 +33,7 @@ sub auto :Private {
     $c->stash(title => FBCE->config->{'title'});
     my $now = DateTime->now();
     $c->stash(now => $now);
-    my $schedule = $c->comp('FBCE::Model::Schedule');
+    my $schedule = FBCE->model('Schedule');
     foreach my $phase ("nominating", "voting") {
 	foreach my $endpoint ("${phase}_starts", "${phase}_ends") {
 	    $c->stash($endpoint => $schedule->{$endpoint});
@@ -44,8 +44,9 @@ sub auto :Private {
     $c->stash(nominating => $schedule->nominating($now));
     $c->stash(voting => $schedule->voting($now));
     $c->stash(announced => $schedule->announced($now));
-    # XXX does not really belong in FBCE::Schedule
-    $c->stash(max_votes => $schedule->{'max_votes'});
+
+    my $rules = FBCE->model('Rules');
+    $c->stash(max_votes => $rules->{'max_votes'});
 
     # Authentication
     if ($c->request->path !~ m/^(login|logout|bylaws|help|static\/.*)?$/) {