Changeset 58

Timestamp:

03/17/09 03:36:29 (15 years ago)

Author:

nanardon

Message:

• more improvement on admin page

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (1 diff)
• lib/Vote/Model/Vote.pm (modified) (1 diff)
• root/templates/admin/default.tt (modified) (6 diffs)

trunk/lib/Vote/Controller/Admin.pm

@@ -38 +38 @@
     my $vote = $c->model('Vote');
 
+    $vote->vote_info($id) or do {
+        $c->res->redirect($c->uri_for('/'));
+        return;
+    };
+
     my $password = $c->session->{vpassword} || $c->req->param('vpassword');
 
     if (!$c->model('Vote')->auth_poll($id, $password)) {
-        $c->stash->{page}{title} = $c->model('Vote')->vote_info($id)->{label} . ': Login d\'administration';
+        $c->stash->{page}{title} = $vote->vote_info($id)->{label} . ': Login d\'administration';
         $c->session->{vpassword} = undef;
         $c->stash->{template} = 'admin/login.tt';

trunk/lib/Vote/Model/Vote.pm

@@ -181 +181 @@
         }
     }
+    $res->{free_choice} = 0; # avoiding undef
     $res
 }

trunk/root/templates/admin/default.tt

@@ -12 +12 @@
 Label: <input type="text" name="label" value="[% c.req.param('label') || thisvote.label | html %]">
 <br>
-Description: <textarea name="description">[% c.req.param('description') || thisvote.description | html %]</textarea>
+Description:<br>
+<textarea name="description" cols="60" rows="4">[% c.req.param('description') || thisvote.description | html %]</textarea>
 <br>
+<br>
+<i>Les dates sont au format AAAA-MM-JJ HH:MM:SS</i><br>
 Debut du vote:
 <input type="text" name="start" value="[% c.req.param('start') || thisvote.start | html %]">
@@ -20 +23 @@
 <input type="text" name="end" value="[% c.req.param('end') || thisvote.end | html %]">
 <br>
+<br>
 Nombre de choix possible:
 <input type="text" name="choice_count" value="[% c.req.param('choice_count') || thisvote.choice_count | html %]">
 <br>
 Nombre de choix libres:
-<input type="text" name="free_choice" value="[% c.req.param('free_choice') || thisvote.free_choice | html %]">
+<input type="text" name="free_choice" value="[% c.req.param('free_choice') || thisvote.free_choice || 0 | html %]">
 <br>
 <input type="submit">
@@ -30 +34 @@
 </td>
 <td valign="TOP">
+[% IF ! vote.vote_choices(voteid).size %]
+<p class="alert">Aucun choix configuré</p>
+[% ELSE %]
 [% FOREACH choice = vote.vote_choices(voteid) %]
 <form action="[% c.uri_for(voteid) %]">
@@ -39 +46 @@
 [% END %]
 <form action="[% c.uri_for(voteid) %]">
+[% END %]
 Ajouter un choix:<br>
 <input type="text" name="addch">
@@ -52 +60 @@
 <tr>
 <td valign="TOP">
+[% IF NOT vote.vote_voting_count(voteid) %]
+<p class="alert">Aucun votant inscrit</p>
+[% ELSE %]
 [% signing = vote.vote_voting(voteid) %]
 [% FOREACH thisvoting = signing %]
@@ -61 +72 @@
 <input type="submit" name="delete" value="delete"><br>
 </form>
+[% END %]
 [% END %]
 </td>