diff options
Diffstat (limited to 'perllib/FixMyStreet/App/Controller')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Around.pm | 4 | ||||
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/Questionnaire.pm | 11 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 19 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 6 |
4 files changed, 14 insertions, 26 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index f8befcef7..054f83a35 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -182,12 +182,12 @@ sub display_location : Private { # create a list of all the pins my @pins = map { my $pin_colour = $_->{state} eq 'fixed' ? 'green' : 'red'; - [ $_->{latitude}, $_->{longitude}, $pin_colour, $_->{id} ]; + [ $_->{latitude}, $_->{longitude}, $pin_colour, $_->{id}, $_->{title} ]; } @$on_map_all, @$around_map; { # FIXME - ideally this indented code should be in the templates $c->stash->{map_html} = FixMyStreet::Map::display_map( - $c->fake_q, + $c, $c->fake_q, latitude => $latitude, longitude => $longitude, type => 1, diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm index 8b804e421..0fafcdc2e 100755 --- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm +++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm @@ -202,14 +202,17 @@ sub display : Private { map { Utils::truncate_coordinate($_) } ( $problem->latitude, $problem->longitude ); - my $problem_text = ''; # Page::display_problem_text($c->fake_q, $problem); # FIXME This needs to be in the template - $c->stash->{updates} = ''; # FIXME Should be database ResultSet of problem's pdates + my $updates = $c->model('DB::Comment')->search( + { problem_id => $problem->id, state => 'confirmed' }, + { order_by => 'confirmed' } + ); + $c->stash->{updates} = $updates; + $c->stash->{map_start_html} = FixMyStreet::Map::display_map( - $c->fake_q, + $c, $c->fake_q, latitude => $problem->latitude, longitude => $problem->longitude, pins => [ [ $problem->latitude, $problem->longitude, $problem->state eq 'fixed' ? 'green' : 'red' ] ], - pre => $problem_text, ); $c->stash->{map_js} = FixMyStreet::Map::header_js(); $c->stash->{cobrand_form_elements} = $c->cobrand->form_elements('questionnaireForm'); diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 3a915b0a0..a0e5d44c4 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -148,23 +148,10 @@ sub format_problem_for_display : Private { sub generate_map_tags : Private { my ( $self, $c ) = @_; - my $problem = $c->stash->{problem}; - - my ( $short_lat, $short_lon ) = - ( $c->stash->{short_latitude}, $c->stash->{short_longitude} ); - - my $google_link = - $c->cobrand->base_url_for_emails() . '/report/' . $problem->id; - - $c->stash->{map_links} = - "<p id='sub_map_links'>" - . "<a href=\"http://maps.google.co.uk/maps?output=embed&z=16&q=" - . URI::Escape::uri_escape_utf8( $problem->title . ' - ' . $google_link ) - . "\@$short_lat,$short_lon\">View on Google Maps</a></p>" - if mySociety::Config::get('COUNTRY') eq 'GB'; + my $problem = $c->stash->{problem}; $c->stash->{map_start_html} = FixMyStreet::Map::display_map( - $c->fake_q, + $c, $c->fake_q, latitude => $problem->latitude, longitude => $problem->longitude, type => 0, @@ -174,7 +161,7 @@ sub generate_map_tags : Private { ); $c->stash->{map_js} = FixMyStreet::Map::header_js(); - return 1; + return 1; } __PACKAGE__->meta->make_immutable; diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 180d2198d..817cee11e 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -903,13 +903,11 @@ sub generate_map : Private { # Don't do anything if the user skipped the map unless ( $c->req->param('skipped') ) { - my $map_type = $allow_photo_upload ? 2 : 1; - $c->stash->{map_html} = FixMyStreet::Map::display_map( - $c->fake_q, + $c, $c->fake_q, latitude => $latitude, longitude => $longitude, - type => $map_type, + type => 1, pins => [ [ $latitude, $longitude, 'purple' ] ], ); } |