diff options
| author | Edmund von der Burg <evdb@mysociety.org> | 2011-04-05 14:44:17 +0100 |
|---|---|---|
| committer | Edmund von der Burg <evdb@mysociety.org> | 2011-04-05 14:44:17 +0100 |
| commit | f4fc15a80945cb85841aa37ce30b810321a30337 (patch) | |
| tree | 82dd8895f89f2e823ab6efeb67d61fa735deb28a | |
| parent | 2a91f65e2b6f01e0fb477644cf1c3e18865a5025 (diff) | |
fixes to match the changed map code
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 21 | ||||
| -rw-r--r-- | templates/web/default/report/new/fill_in_details.html | 3 |
2 files changed, 15 insertions, 9 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index c2488424d..071b36df0 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -439,9 +439,10 @@ sub determine_location_from_tile_click : Private { return unless $pin_x && $pin_y; # convert the click to lat and lng - my ( $latitude, $longitude ) = - FixMyStreet::Map::click_to_wgs84( $pin_tile_x, $pin_x, $pin_tile_y, - $pin_y ); + my ( $latitude, $longitude ) = FixMyStreet::Map::click_to_wgs84( # + $c->req, # + $pin_tile_x, $pin_x, $pin_tile_y, $pin_y + ); # store it on the stash $c->stash->{latitude} = $latitude; @@ -470,6 +471,12 @@ sub determine_location_from_coords : Private { if ( defined $latitude && defined $longitude ) { $c->stash->{latitude} = $latitude; $c->stash->{longitude} = $longitude; + + # Also save the pc if there is one + if ( my $pc = $c->req->param('pc') ) { + $c->stash->{pc} = $pc; + } + return 1; } @@ -1041,7 +1048,7 @@ sub save_user_and_report : Private { # Save or update the user if appropriate if ( !$report_user->in_storage ) { - $report_user->insert(); + $report_user->insert(); } elsif ( $c->user && $report_user->id == $c->user->id ) { $report_user->update(); @@ -1110,9 +1117,11 @@ sub generate_map : Private { my $form_action = $c->uri_for(''); my $pc = encode_entities( $c->stash->{pc} ); - $c->stash->{map_html} = <<END_MAP_HTML; + $c->stash->{map_html} = <<"END_MAP_HTML"; <form action="$form_action" method="post" name="mapSkippedForm"$enctype> -<input type="hidden" name="pc" value="pc"> +<input type="hidden" name="latitude" value="$latitude"> +<input type="hidden" name="longitude" value="$longitude"> +<input type="hidden" name="pc" value="$pc"> <input type="hidden" name="skipped" value="1"> $cobrand_form_elements <div id="skipped-map"> diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html index c7ed908a8..7cf24f619 100644 --- a/templates/web/default/report/new/fill_in_details.html +++ b/templates/web/default/report/new/fill_in_details.html @@ -25,9 +25,6 @@ [% INCLUDE 'report/new/fill_in_details_text.html' %] [% END %] -<input type="hidden" name="latitude" value="[% latitude | html %]"> -<input type="hidden" name="longitude" value="[% longitude | html %]"> - [% FOREACH error IN errors %] [% '<ul class="error">' IF loop.first %] <li>[% error %]</li> |