From owner-svn-src-user@FreeBSD.ORG  Thu Jun  7 09:22:42 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 4C6991065675;
	Thu,  7 Jun 2012 09:22:42 +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 388588FC14;
	Thu,  7 Jun 2012 09:22:42 +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 q579Mgn8073601;
	Thu, 7 Jun 2012 09:22:42 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q579Mg8o073599;
	Thu, 7 Jun 2012 09:22:42 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201206070922.q579Mg8o073599@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 7 Jun 2012 09:22:42 +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: r236709 - 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: Thu, 07 Jun 2012 09:22:42 -0000

Author: des
Date: Thu Jun  7 09:22:41 2012
New Revision: 236709
URL: http://svn.freebsd.org/changeset/base/236709

Log:
  Access the model through our context rather than directly from FBCE.

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	Thu Jun  7 09:21:48 2012	(r236708)
+++ user/des/fbce/lib/FBCE/Controller/Root.pm	Thu Jun  7 09:22:41 2012	(r236709)
@@ -30,10 +30,10 @@ sub auto :Private {
     my ($self, $c) = @_;
 
     # Stash schedule information etc.
-    $c->stash(title => FBCE->config->{'title'});
+    $c->stash(title => $c->config->{'title'});
     my $now = DateTime->now();
     $c->stash(now => $now);
-    my $schedule = FBCE->model('Schedule');
+    my $schedule = $c->model('Schedule');
     foreach my $phase ("nominating", "voting") {
 	foreach my $endpoint ("${phase}_starts", "${phase}_ends") {
 	    $c->stash($endpoint => $schedule->{$endpoint});
@@ -45,7 +45,7 @@ sub auto :Private {
     $c->stash(voting => $schedule->voting($now));
     $c->stash(announced => $schedule->announced($now));
 
-    my $rules = FBCE->model('Rules');
+    my $rules = $c->model('Rules');
     $c->stash(max_votes => $rules->{'max_votes'});
 
     # Authentication