Changeset 226 for trunk/lib

Timestamp:

04/21/09 00:15:30 (15 years ago)

Author:

nanardon

Message:

• prefer poll uid in url instead db id (if available)

Location:

trunk/lib/Vote/Controller

Files:

• Admin.pm (modified) (3 diffs)
• Newpoll.pm (modified) (1 diff)
• Vote.pm (modified) (2 diffs)

trunk/lib/Vote/Controller/Admin.pm

@@ -187 +187 @@
 }
 
-sub voting: LocalRegex('^(\d+)/voting$') {
+sub voting: LocalRegex('^(\w+)/voting$') {
     my ($self, $c) = @_;
     ($c->stash->{voteid}) = @{ $c->req->snippets || [] };
@@ -202 +202 @@
 }
 
-sub ballot: LocalRegex('^(\d+)/ballot$') {
+sub ballot: LocalRegex('^(\w+)/ballot$') {
     my ($self, $c) = @_;
     ($c->stash->{voteid}) = @{ $c->req->snippets || [] };
@@ -217 +217 @@
 }
 
-sub privatekey : LocalRegex('^(\d+)/privatekey$') {
+sub privatekey : LocalRegex('^(\w+)/privatekey$') {
     my ($self, $c) = @_;
     ($c->stash->{voteid}) = @{ $c->req->snippets || [] };

trunk/lib/Vote/Controller/Newpoll.pm

@@ -69 +69 @@
         my $pid = $c->model('Vote')->poll_from_request($id, $c->req->param('passwd'));
         $c->session->{'vpass' . $pid} = $c->req->param('passwd'); # avoid auth on admin page
-        $c->res->redirect($c->uri_for('/admin', $pid));
+        $c->res->redirect($c->uri_for('/admin', $c->model('Vote')->poll($pid)->uid));
     }
 }

trunk/lib/Vote/Controller/Vote.pm

@@ -41 +41 @@
 }
 
-sub report: LocalRegex('^(\d+)/(results|report).(\w+)$') {
-    my ($self, $c, $id, @sub) = @_;
+sub report: LocalRegex('^(\w+)/(results|report).(\w+)$') {
+    my ($self, $c) = @_;
     my $doc;
     ($c->stash->{voteid}, $doc, $c->stash->{format}) = @{ $c->req->snippets || [] };
@@ -54 +54 @@
     # Ensure report is not availlable before end of poll
     if ($vote->poll($c->stash->{voteid})->status ne 'AFTER') {
-        $c->res->redirect($c->uri_for('/vote', $c->stash->{voteid}));
+        $c->res->redirect($c->uri_for('/vote', $vote->poll($c->stash->{voteid})->uid));
         return;
     };