Changeset 434
- Timestamp:
- 10/07/10 03:47:16 (14 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/Epoll/Controller/Admin.pm
r393 r434 21 21 22 22 =cut 23 24 sub begin : Private {25 my ( $self, $c, @args ) = @_;26 $c->model('Vote')->rollback;27 }28 23 29 24 sub index : Private { … … 384 379 elsif ($c->stash->{ajax}) { $c->forward(qw/Epoll::View::Ajax/) } 385 380 else { $c->forward(qw/Epoll::View::TT/) } 381 $c->model('Vote')->rollback; 386 382 } 387 383 -
trunk/lib/Epoll/Controller/Ballot.pm
r369 r434 21 21 22 22 =cut 23 24 sub begin : Private {25 my ( $self, $c ) = @_;26 $c->model('Vote')->rollback;27 }28 23 29 24 sub index : Private { … … 147 142 if ($c->res->body) { return } 148 143 else { $c->forward(qw/Epoll::View::TT/) } 144 $c->model('Vote')->rollback; 149 145 } 150 146 -
trunk/lib/Epoll/Controller/Newpoll.pm
r393 r434 21 21 22 22 =cut 23 24 sub begin : Private {25 my ( $self, $c ) = @_;26 $c->model('Vote')->rollback;27 $c->model('Vote')->clean_old_poll_request and $c->model('Vote')->commit;28 }29 23 30 24 sub index : Private { … … 101 95 if ($c->res->body) { return } 102 96 else { $c->forward(qw/Epoll::View::TT/) } 97 $c->model('Vote')->rollback; 98 $c->model('Vote')->clean_old_poll_request and $c->model('Vote')->commit; 103 99 } 104 100 -
trunk/lib/Epoll/Controller/Root.pm
r366 r434 30 30 my ( $self, $c ) = @_; 31 31 $c->model('Vote')->rollback; 32 33 my ($locale) = split(';', $c->req->header('Accept-Language') || ''); 34 if (my $plocale = ($c->req->param('locale')|| $c->session->{'locale'})) { 35 $c->session->{'locale'} = $locale = $plocale; 36 } 37 $c->languages($locale ? [ $locale ] : ''); 38 $c->stash->{locale} = $locale; 32 39 } 33 40 -
trunk/lib/Epoll/Controller/Vote.pm
r242 r434 21 21 22 22 =cut 23 24 sub begin : Private {25 my ( $self, $c ) = @_;26 $c->model('Vote')->rollback;27 }28 23 29 24 sub index : Private { … … 68 63 elsif ($c->stash->{latex}) { $c->forward(qw/Epoll::View::Latex/) } 69 64 else { $c->forward(qw/Epoll::View::TT/) } 65 $c->model('Vote')->rollback; 70 66 } 71 67 -
trunk/lib/Epoll/View/Mail.pm
r377 r434 27 27 my ($self, $c, $template, $args) = @_; 28 28 29 my ($locale) = split(';', $c->req->header('Accept-Language') || ''); 30 if (my $plocale = ($c->req->param('locale')|| $c->session->{'locale'})) { 31 $c->session->{'locale'} = $locale = $plocale; 32 } 33 $c->languages($locale ? [ $locale ] : ''); 34 $c->stash->{locale} = $locale; 29 # Backup locale, change it for mail 30 my $prev_language = $c->languages; 31 $c->languages([ $c->req->param('mail_locale') ]) 32 if($c->req->param('mail_locale')); 35 33 36 34 $ENV{MAILADDRESS} = $args->{From}; … … 49 47 if ($@) { 50 48 $c->stash->{mail_error} = $@; 51 } 49 } 50 # restore locale 51 $c->languages($prev_language); 52 52 } 53 53 -
trunk/lib/Epoll/View/TT.pm
r281 r434 29 29 my ($self, $c) = @_; 30 30 31 my ($locale) = split(';', $c->req->header('Accept-Language') || '');32 if (my $plocale = ($c->req->param('locale')|| $c->session->{'locale'})) {33 $c->session->{'locale'} = $locale = $plocale;34 }35 $c->languages($locale ? [ $locale ] : '');36 $c->stash->{locale} = $locale;37 38 31 $c->stash->{Epoll}{VERSION} = $Epoll::DB::VERSION; 39 32 Catalyst::View::TT::process($self, $c); -
trunk/root/templates/admin/voters.tt
r429 r434 32 32 [% IF poll.info.hend %] 33 33 <form action="[% c.uri_for(poll.uid, 'voters') %]" method="POST"> 34 [% l('Email language') %]: [% INCLUDE 'includes/locale_select.tt' %]<br>34 [% l('Email language') %]: [% INCLUDE 'includes/locale_select.tt' varname='mail_locale' %]<br> 35 35 <input type="submit" name="mailpasswd" value="[% l('Send password') %]"> 36 36 </form> -
trunk/root/templates/includes/locale_select.tt
r340 r434 1 1 <!-- $Id$ --> 2 2 [% langs = [ 'fr', 'de' ] %] 3 <select name=" locale">3 <select name="[% varname || 'locale' %]"> 4 4 <option>C</option> 5 5 [% FOREACH lang = langs.sort %]
Note: See TracChangeset
for help on using the changeset viewer.