diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 19 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/Update.pm | 18 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/User.pm | 2 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 12 |
4 files changed, 12 insertions, 39 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index b50325052..a15ee993f 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -110,23 +110,8 @@ sub format_problem_for_display : Private { $c->stash->{report_name} = $c->req->param('name'); - if ( $c->req->param('submit_update') ) { - # we may have munged these previously in /report/update - # so only set if they're not already in the stash - $c->stash->{form_name} ||= $c->req->param('name'); - $c->stash->{update_text} ||= $c->req->param('update'); - $c->stash->{email} ||= $c->req->param('rznvy'); - $c->stash->{fixed} ||= $c->req->param('fixed') ? ' checked' : ''; - $c->stash->{add_alert_checked} ||= - ( $c->req->param('add_alert') ? ' checked' : '' ); - } - else { - if ( $c->user ) { - $c->stash->{form_name} = $c->user->name; - $c->stash->{email} = $c->user->email; - } - $c->stash->{may_show_name} = ' checked'; - $c->stash->{add_alert_checked} = ' checked'; + unless ( $c->req->param('submit_update') ) { + $c->stash->{add_alert} = 1; } $c->forward('generate_map_tags'); diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index 4e0d6d6c5..ccdfa8a54 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -77,14 +77,6 @@ sub update_problem : Private { return 1; } -sub display_confirmation : Private { - my ( $self, $c ) = @_; - - $c->stash->{template} = 'tokens/confirm_update.html'; - - return 1; -} - =head2 process_user Load user from the database or prepare a new one. @@ -106,13 +98,10 @@ sub process_user : Private { $email =~ s{\s+}{}g; my $update_user = $c->model('DB::User')->find_or_new( { email => $email } ); - - # set the user's name if they don't have one $update_user->name( Utils::trim_text( $params{name} ) ) - unless $update_user->name; + if $params{name}; $c->stash->{update_user} = $update_user; - $c->stash->{email} = $update_user->email; return 1; } @@ -158,9 +147,7 @@ sub process_update : Private { ); $c->stash->{update} = $update; - $c->stash->{update_text} = $update->text; $c->stash->{add_alert} = $c->req->param('add_alert'); - $c->stash->{may_show_name} = ' checked' if $c->req->param('may_show_name'); return 1; } @@ -215,6 +202,7 @@ sub save_update : Private { $update->user->insert; } elsif ( $c->user && $c->user->id == $update->user->id ) { + # Logged in and same user, so can confirm update straight away $update->user->update; $update->confirm; } @@ -250,8 +238,8 @@ sub redirect_or_confirm_creation : Private { # If confirmed send the user straight there. if ( $update->confirmed ) { - $c->forward( 'signup_for_alerts' ); $c->forward( 'update_problem' ); + $c->forward( 'signup_for_alerts' ); my $report_uri = $c->uri_for( '/report', $update->problem_id ); $c->res->redirect($report_uri); $c->detach; diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm index 5e18596c2..e4dd5da5b 100644 --- a/perllib/FixMyStreet/DB/Result/User.pm +++ b/perllib/FixMyStreet/DB/Result/User.pm @@ -72,7 +72,7 @@ sub check_for_errors { my %errors = (); - if ( $self->name !~ m/\S/ ) { + if ( !$self->name || $self->name !~ m/\S/ ) { $errors{name} = _('Please enter your name'); } elsif (length( $self->name ) < 5 diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 5cc3ec21d..a22cf4df8 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -79,11 +79,11 @@ <div> <label for="form_name">[% loc( 'Name:') %]</label> - <input type="text" name="name" id="form_name" value="[% form_name | html %]" size="20"> [% loc( '(optional)' ) %] + <input type="text" name="name" id="form_name" value="[% update.name || c.user.name | html %]" size="20"> [% loc( '(optional)' ) %] </div> <div class="checkbox"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% may_show_name %]> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> <small>[% loc('(we never show your email address or phone number)') %]</small> </div> @@ -93,7 +93,7 @@ [% END %] <div class="form-field"> <label for="form_rznvy">[% loc('Email' ) %]</label> - <input type="text" name="rznvy" id="form_rznvy" value="[% email | html %]" size="20"> + <input type="text" name="rznvy" id="form_rznvy" value="[% update.user.email || c.user.email | html %]" size="20"> </div> [% IF field_errors.update %] @@ -101,13 +101,13 @@ [% END %] <div class="form-field"> <label for="form_update">[% loc( 'Update:' ) %]</label> - <textarea name="update" id="form_update" rows="7" cols="30">[% update_text | html %]</textarea> + <textarea name="update" id="form_update" rows="7" cols="30">[% update.text | html %]</textarea> </div> [% IF problem.state != 'fixed' %] <div class="checkbox"> - <input type="checkbox" name="fixed" id="form_fixed" value="1"[% fixed %]> + <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]> <label for="form_fixed">[% loc('This problem has been fixed') %]</label> </div> [% END %] @@ -129,7 +129,7 @@ <div class="checkbox"> - <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% add_alert_checked %]> + <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]> <label for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label> </div> |