From owner-svn-src-user@FreeBSD.ORG  Fri Jun  8 08:23:56 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 1E938106564A;
	Fri,  8 Jun 2012 08:23:56 +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 0A7D28FC0A;
	Fri,  8 Jun 2012 08:23:56 +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 q588NtPF042684;
	Fri, 8 Jun 2012 08:23:55 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q588Ntw6042682;
	Fri, 8 Jun 2012 08:23:55 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201206080823.q588Ntw6042682@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Fri, 8 Jun 2012 08:23:55 +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: r236739 - 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: Fri, 08 Jun 2012 08:23:56 -0000

Author: des
Date: Fri Jun  8 08:23:55 2012
New Revision: 236739
URL: http://svn.freebsd.org/changeset/base/236739

Log:
  Don't try to interpolate a method call.

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

Modified: user/des/fbce/lib/FBCE/Controller/Vote.pm
==============================================================================
--- user/des/fbce/lib/FBCE/Controller/Vote.pm	Fri Jun  8 08:04:51 2012	(r236738)
+++ user/des/fbce/lib/FBCE/Controller/Vote.pm	Fri Jun  8 08:23:55 2012	(r236739)
@@ -47,7 +47,8 @@ sub index :Path :Args(0) {
 	}
 	$candidates->reset;
 	if (scalar keys %vote_for > $c->stash->{'max_votes'}) {
-	    $error = "You can only vote for $c->stash->{'max_votes'} candidates.";
+	    $c->stash(error => "You can only vote for " .
+		      $c->stash->{'max_votes'} . " candidates.");
 	} else {
 	    my $schema = $user->result_source->schema;
 	    $schema->txn_do(sub {
@@ -57,7 +58,7 @@ sub index :Path :Args(0) {
 		}
 	    });
 	    if ($@) {
-		$error = "Database error!";
+		$c->stash(error => "Database error!");
 	    } else {
 		$c->stash(vote_ok => 1);
 	    }
@@ -68,9 +69,7 @@ sub index :Path :Args(0) {
 	    $voted_for{$vote->candidate->login} = 1;
 	}
     }
-    $c->stash(error => $error);
     $c->stash(candidates => $candidates);
-    $c->stash(max_votes => $c->stash->{'max_votes'});
     $c->stash(voted_for => \%voted_for);
 }