Changeset 307
- Timestamp:
- 05/21/10 18:19:22 (14 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/1 merged: 305
- Property svn:mergeinfo changed
-
trunk/README
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/epoll.yml.example
r248 r307 6 6 # The smtp serveur to use, default is localhost 7 7 smtp: 8 # This change the poll creation behavior, instead ask want confirmation by mail 9 # it ask for this password (in clear) 10 # newpollpasswd: -
trunk/lib/Epoll/Controller/Newpoll.pm
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/1/lib/Vote/Controller/Newpoll.pm merged eligible /branches/1/lib/Epoll/Controller/Newpoll.pm 164-244,305
r257 r307 33 33 $c->stash->{page}{title} = 'Créer un nouveau vote'; 34 34 if ($c->req->param('mail')) { 35 my $reqid = $c->model('Vote')->create_poll_request( 36 mail => $c->req->param('mail'), 37 label => $c->req->param('label'), 38 ); 39 $c->forward( 40 q'Epoll::View::Mail', 'render', 41 [ 'poll_request.tt', { 42 To => $c->req->param('mail'), 43 Subject => "New poll request", 44 mail => { 45 label => $c->req->param('label'), 46 reqid => $reqid, 35 if ($c->config->{newpollpasswd}) { 36 if (($c->req->param('passwd') || '') eq $c->config->{newpollpasswd}) 37 { 38 if (my $pid = $c->model('Vote')->create_poll( 39 $c->req->param('label'), 40 $c->req->param('mail'), 41 $c->req->param('vpasswd'), 42 ) 43 ) { 44 $c->session->{'vpass' . $pid} = $c->req->param('vpasswd'); # avoid auth on admin page 45 $c->res->redirect($c->uri_for('/admin', 46 $c->model('Vote')->poll_id_from_uid($pid)) 47 ); 48 } 49 } else { 50 $c->stash->{passwderror} = 1; 47 51 } 48 } ] 49 ); 50 51 $c->stash->{template} = 'newpoll/request.tt'; 52 } else { 53 my $reqid = $c->model('Vote')->create_poll_request( 54 mail => $c->req->param('mail'), 55 label => $c->req->param('label'), 56 ); 57 $c->forward( 58 q'Epoll::View::Mail', 'render', 59 [ 'poll_request.tt', { 60 To => $c->req->param('mail'), 61 Subject => "New poll request", 62 mail => { 63 label => $c->req->param('label'), 64 reqid => $reqid, 65 } 66 } ] 67 ); 68 $c->stash->{template} = 'newpoll/request.tt'; 69 } 52 70 } 53 71 -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
trunk/lib/Epoll/DB.pm
r303 r307 158 158 my $rinfo = $self->poll_request_info($rid) or return; 159 159 160 my $pollid = $self-> create_poll($rinfo->{mail}, $rinfo->{label}, $passwd);160 my $pollid = $self->_create_poll($rinfo->{mail}, $rinfo->{label}, $passwd); 161 161 162 162 my $delreq = $self->db->prepare_cached( … … 170 170 171 171 sub create_poll { 172 my ($self, @args) = @_; 173 my $uid = $self->_create_poll(@args); 174 $self->commit; 175 $uid; 176 } 177 178 sub _create_poll { 172 179 my ($self, $mail, $label, $passwd) = @_; 173 180 … … 191 198 return; 192 199 }; 193 194 200 195 201 $newpollid -
trunk/lib/Epoll/I18N/fr.po
r301 r307 221 221 "à participer à ce vote ?" 222 222 223 #: root/templates/newpoll/index.tt:21 224 #, fuzzy 225 msgid "Invalid site password:" 226 msgstr "envoyer les mots de passe" 227 223 228 #: root/templates/admin/date.tt:31 224 229 msgid "Jan" … … 343 348 msgstr "A participé" 344 349 345 #: root/templates/newpoll/index.tt: 12350 #: root/templates/newpoll/index.tt:27 346 351 msgid "Password" 347 352 msgstr "Mot de passe" 353 354 #: root/templates/newpoll/index.tt:16 355 #, fuzzy 356 msgid "Password of this poll:" 357 msgstr "Oui, détruire ce vote" 348 358 349 359 #: root/templates/ballot/login.tt:17 … … 368 378 msgstr "Le vote est en cours" 369 379 370 #: root/templates/newpoll/index.tt:1 0380 #: root/templates/newpoll/index.tt:12 371 381 msgid "Poll name:" 372 382 msgstr "Nom du vote:" … … 408 418 msgid "September" 409 419 msgstr "Septembre" 420 421 #: root/templates/newpoll/index.tt:24 422 #, fuzzy 423 msgid "Site password:" 424 msgstr "envoyer les mots de passe" 410 425 411 426 #: root/templates/admin/includes/ballot_validation.tt:8 -
trunk/lib/Epoll/I18N/messages.pot
r301 r307 217 217 msgstr "" 218 218 219 #: root/templates/newpoll/index.tt:21 220 msgid "Invalid site password:" 221 msgstr "" 222 219 223 #: root/templates/admin/date.tt:31 220 224 msgid "Jan" … … 338 342 msgstr "" 339 343 340 #: root/templates/newpoll/index.tt: 12344 #: root/templates/newpoll/index.tt:27 341 345 msgid "Password" 346 msgstr "" 347 348 #: root/templates/newpoll/index.tt:16 349 msgid "Password of this poll:" 342 350 msgstr "" 343 351 … … 363 371 msgstr "" 364 372 365 #: root/templates/newpoll/index.tt:1 0373 #: root/templates/newpoll/index.tt:12 366 374 msgid "Poll name:" 367 375 msgstr "" … … 402 410 #: root/templates/admin/date.tt:25 403 411 msgid "September" 412 msgstr "" 413 414 #: root/templates/newpoll/index.tt:24 415 msgid "Site password:" 404 416 msgstr "" 405 417 -
trunk/root/templates/newpoll/index.tt
-
Property
svn:mergeinfo
set to
False
/branches/1/root/templates/newpoll/index.tt merged eligible
r285 r307 7 7 <table border="0"> 8 8 <tbody align="center"> 9 <tr><th>[% l('Your mail:') %]</th><td><input type="text" name="mail" tabindex="1" size="45" maxlength="150"></td></tr> 10 <tr><th>[% l('Poll name:') %]</th><td><input type="text" name="label" tabindex="2" size="45" maxlength="150"></td></tr> 9 <tr><th>[% l('Your mail:') %]</th><td> 10 <input type="text" name="mail" value="[% c.req.param('mail') | html %]" tabindex="1" size="45" maxlength="150"> 11 </td></tr> 12 <tr><th>[% l('Poll name:') %]</th><td> 13 <input type="text" name="label" value="[% c.req.param('label') | html %]" tabindex="2" size="45" maxlength="150"> 14 </td></tr> 15 [% IF c.config.newpollpasswd %] 16 <tr><th>[% l('Password of this poll:') %]</th><td> 17 <input type="password" name="vpasswd" value="[% c.req.param('vpasswd') | html %]" tabindex="3"> 18 </td></tr> 19 [% IF passwderror %] 20 <tr><td colspan="2" class="alert"> 21 [% l('Invalid site password:') %] 22 </td></tr> 23 [% END %] 24 <tr><th>[% l('Site password:') %]</th><td><input type="password" name="passwd" tabindex="4"></td></tr> 25 [% END %] 11 26 <!-- Cf http://forge.ipsl.jussieu.fr/epoll/ticket/1 12 27 <tr><th>[% l('Password') %]</th><td><input type="password" name="vpasswd"></td></tr> -
Property
svn:mergeinfo
set to
False
Note: See TracChangeset
for help on using the changeset viewer.