Changeset 167

Timestamp:

04/06/09 18:45:41 (15 years ago)

Author:

nanardon

Message:

• split voting admin page in subsection

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/Vote/Controller/Admin.pm (modified) (3 diffs)
• root/templates/admin/default.tt (modified) (2 diffs)
• root/templates/admin/voting.tt (added)
• root/templates/default.tt (modified) (1 diff)
• root/templates/includes/admin_menu.tt (added)

trunk/MANIFEST

@@ -59 +59 @@
 root/templates/admin/index.tt
 root/templates/admin/login.tt
+root/templates/includes/admin_menu.tt
+root/templates/admin/voting.tt
 root/templates/ballot/closed.tt
 root/templates/ballot/default.tt

trunk/lib/Vote/Controller/Admin.pm

@@ -23 +23 @@
 
 sub begin : Private {
-    my ( $self, $c ) = @_;
+    my ( $self, $c, @args ) = @_;
     $c->model('Vote')->db->rollback;
+
+    warn join('-', @args);
 }
 
@@ -33 +35 @@
 }
 
-sub default : Private {
-    my ( $self, $c, undef, $id ) = @_;
-    $c->stash->{voteid} = $id;
+sub modify_poll : Private {
+    my ( $self, $c) = @_;
+    my $id = $c->stash->{voteid};
+
     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} = $vote->vote_info($id)->{label} . ': Login d\'administration';
-        $c->session->{vpassword} = undef;
-        $c->stash->{template} = 'admin/login.tt';
-        return;
-    }
-
-    $c->session->{vpassword} = $password;
-
-    $c->stash->{page}{title} = $c->model('Vote')->vote_info($id)->{label} . ': Administration';
-
     for ($vote->vote_status($id) || '') {
     /^BEFORE$/ and do {
@@ -124 +108 @@
     };
     }
+}
 
+sub auth : Private {
+    my ($self, $c) = @_;
+    my $vote = $c->model('Vote');
+    my $password = $c->session->{vpassword} || $c->req->param('vpassword');
+
+    if (!$c->model('Vote')->auth_poll($c->stash->{voteid}, $password)) {
+        $c->stash->{page}{title} = $vote->vote_info(
+            $c->stash->{voteid}
+        )->{label} . ': Login d\'administration';
+        $c->session->{vpassword} = undef;
+        $c->stash->{template} = 'admin/login.tt';
+        return;
+    }
+    $c->session->{vpassword} = $password;
+    return 1;
+}
+
+sub default : Private {
+    my ( $self, $c, undef, $id ) = @_;
+    $c->stash->{voteid} = $id;
+    my $vote = $c->model('Vote');
+
+    $vote->vote_info($id) or do {
+        $c->res->redirect($c->uri_for('/'));
+        return;
+    };
+
+    $c->forward('auth') or return;
+    $c->forward('modify_poll');
+    $c->stash->{page}{title} = $c->model('Vote')->vote_info($id)->{label} . ': Administration';
+
+
+}
+
+sub voting: LocalRegex('^(\d+)/voting$') {
+    my ($self, $c, $id, @sub) = @_;
+    ($c->stash->{voteid}) = @{ $c->req->snippets || [] };
+    my $vote = $c->model('Vote');
+
+    $vote->vote_info($id) or do {
+        $c->res->redirect($c->uri_for('/'));
+        return;
+    };
+
+    $c->forward('auth') or return;
+    $c->forward('modify_poll');
+    $c->stash->{page}{title} = $c->model('Vote')->vote_info($id)->{label} . ': Administration';
 }
 

trunk/root/templates/admin/default.tt

@@ +1 @@
+[% INCLUDE 'includes/admin_menu.tt' %]
+
 <DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>
 
 [% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 [% IF vote.vote_status(voteid) == 'BEFORE' %]
@@ -70 +73 @@
 [% END %]
 
-[% IF vote.vote_status(voteid) != 'AFTER' %]
-<table border="1">
-<tr><th colspan=2>Liste des votants</th></tr>
-<tr>
-<td valign="TOP">
-<p>Ajouter un votant</p>
-<form action="[% c.uri_for(voteid) %]" method="POST">
-Nom: <input type="text" name="id"><br>
-Mail: <input type="text" name="mail"><br>
-<input type="submit" value="Ajouter">
-</form>
-<hr>
-<p>Soumettre la liste via un fichier csv (le Nom est optionnel)</p>
-<p>Format: <i>Mail@domain;Nom</i></p>
-<form method="POST" ENCTYPE="multipart/form-data" action="[% c.uri_for(voteid) %]">
-<input type="file" name="votinglist"><br>
-[% IF vote.vote_status(voteid) == 'BEFORE' %]
-<input type="checkbox" name="delete">Effacer la liste des votants<br>
-[% END %]
-<input type="submit" value="Ajouter">
-</form>
-<hr>
-<p>Envoyer les mots de passes au nouveaux votants</p>
-<form action="[% c.uri_for(voteid) %]" method="POST">
-<input type="submit" name="mailpasswd" value="Envoyer les mot de passe">
-</form>
-</td>
-<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 %]
-[% voting = vote.voting_info(thisvoting) %]
-[% IF NOT voting.date %]
-<form action="[% c.uri_for(voteid) %]" method="POST">
-<input type="hidden" name="delvoting" value="[% voting.vkey %]">
-[% END %]
-[% voting.label | html %] [% voting.mail | html %]
-[% IF voting.passwd %]<i>(pass envoyé)</i>[% END %]
-[% IF NOT voting.date %]
-<input type="submit" name="delete" value="delete"><br>
-</form>
-[% ELSE %]
-(<i>a voté</i>)
-[% END %]
-[% END %]
-[% END %]
-</td>
-</tr>
-</table>
+[% # INCLUDE 'includes/poll.tt' %]
 
-[% ELSE %]
-
-[% # INCLUDE 'includes/poll.tt' %]
+[% IF poll.status == 'AFTER' %]
 
 [% FOREACH untrusted = vote.vote_ballot_untrusted_values(voteid) %]

trunk/root/templates/default.tt

@@ -1 @@
-
 [% vote = c.model('Vote') %]
-
 
 [% FOREACH id = vote.list_running_vote %]