From owner-svn-src-user@freebsd.org Wed May 16 23:10:21 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3368EDBC3B for ; Wed, 16 May 2018 23:10:20 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 95B9D81A68; Wed, 16 May 2018 23:10:20 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7218620A9A; Wed, 16 May 2018 23:10:20 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4GNAKwd091706; Wed, 16 May 2018 23:10:20 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GNAJRv091701; Wed, 16 May 2018 23:10:19 GMT (envelope-from des@FreeBSD.org) Message-Id: <201805162310.w4GNAJRv091701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Wed, 16 May 2018 23:10:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333692 - in user/des/fbce: lib/FBCE/Controller root/run root/see X-SVN-Group: user X-SVN-Commit-Author: des X-SVN-Commit-Paths: in user/des/fbce: lib/FBCE/Controller root/run root/see X-SVN-Commit-Revision: 333692 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2018 23:10:21 -0000 Author: des Date: Wed May 16 23:10:19 2018 New Revision: 333692 URL: https://svnweb.freebsd.org/changeset/base/333692 Log: Allow a candidate to not provide a slogan, but display an error message if the statement is empty. Modified: user/des/fbce/lib/FBCE/Controller/Run.pm user/des/fbce/root/run/edit.tt user/des/fbce/root/run/register.tt user/des/fbce/root/see/candidate.tt user/des/fbce/root/see/index.tt Modified: user/des/fbce/lib/FBCE/Controller/Run.pm ============================================================================== --- user/des/fbce/lib/FBCE/Controller/Run.pm Wed May 16 22:32:08 2018 (r333691) +++ user/des/fbce/lib/FBCE/Controller/Run.pm Wed May 16 23:10:19 2018 (r333692) @@ -45,13 +45,15 @@ sub register :Local :Args(0) { $c->res->redirect($c->uri_for('/run')); $c->detach(); } - if ($p->{submit}) { + if ($p->{submit} && $p->{long}) { my $stmt = $c->model('FBCE::Statement')-> new({ person => $user, short => $p->{short}, long => $p->{long} }); $stmt->insert() or die("failed to register"); $c->res->redirect($c->uri_for('/run')); $c->detach(); + } elsif ($p->{submit}) { + $c->stash(error => "You must provide a stamement!"); } $c->stash(short => $p->{short}); $c->stash(long => $p->{long}); @@ -76,11 +78,13 @@ sub edit :Local :Args(0) { $c->detach(); } my $statement = $user->statement; - if ($p->{submit}) { + if ($p->{submit} && $p->{long}) { $statement->update({ short => $p->{short}, long => $p->{long} }) or die("failed to update"); $c->res->redirect($c->uri_for('/run')); $c->detach(); + } elsif ($p->{submit}) { + $c->stash(error => "You must provide a stamement!"); } $c->stash(short => $p->{short} // $statement->short); $c->stash(long => $p->{long} // $statement->long); Modified: user/des/fbce/root/run/edit.tt ============================================================================== --- user/des/fbce/root/run/edit.tt Wed May 16 22:32:08 2018 (r333691) +++ user/des/fbce/root/run/edit.tt Wed May 16 23:10:19 2018 (r333692) @@ -8,10 +8,13 @@ [% IF !user.active %]

You are not qualified to run in the election. If you believe this is incorrect, please contact the election administrator.

[% ELSIF nominating == 0 %] +[% IF error != '' %] +
[% error | html %]
+[% END %]
-

Slogan

+

Slogan (optional)

-

Statement (WikiFormat)

+

Statement (WikiFormat)

Modified: user/des/fbce/root/run/register.tt ============================================================================== --- user/des/fbce/root/run/register.tt Wed May 16 22:32:08 2018 (r333691) +++ user/des/fbce/root/run/register.tt Wed May 16 23:10:19 2018 (r333692) @@ -15,8 +15,11 @@

If you have a Gravatar, it will appear next to your statement.

-

Slogan

- +[% IF error %] +
[% error | html %]
+[% END %] +

Slogan (optional)

+

Statement (WikiFormat)

Modified: user/des/fbce/root/see/candidate.tt ============================================================================== --- user/des/fbce/root/see/candidate.tt Wed May 16 22:32:08 2018 (r333691) +++ user/des/fbce/root/see/candidate.tt Wed May 16 23:10:19 2018 (r333692) @@ -10,7 +10,9 @@ [% IF candidate.incumbent %]

(incumbent)

[% END %]
+[% IF candidate.statement.short %]

[% candidate.statement.short | wiki %]

+[% END %]
[% candidate.statement.long | wiki %]
Modified: user/des/fbce/root/see/index.tt ============================================================================== --- user/des/fbce/root/see/index.tt Wed May 16 22:32:08 2018 (r333691) +++ user/des/fbce/root/see/index.tt Wed May 16 23:10:19 2018 (r333692) @@ -15,7 +15,7 @@ [% END %] [% END %]