diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-05-23 09:08:12 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-05-23 09:08:12 +0100 |
| commit | 55d0afab34953d266824448d279d72787bfd6e07 (patch) | |
| tree | 9640df781c74088cb512c0d1ca4f9c8ee5fd950b /perllib/FixMyStreet/App/Controller/Report.pm | |
| parent | c62870edf51e1bfe04ad11256bd7ba8b5a4ee5d5 (diff) | |
| parent | 8fbb9539e8ada7faf6c54c40bda7d059bdfd0c12 (diff) | |
Merge branch 'migrate_to_catalyst' of ssh://git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Report.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 0b235a06e..9041fa731 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -157,7 +157,7 @@ sub format_problem_for_display : Private { $c->stash->{banner} = $c->cobrand->generate_problem_banner($problem); - $c->stash->{allow_photo_upload} = $c->cobrand->allow_photo_display; + $c->stash->{allow_photo_upload} = $c->cobrand->allow_photo_display; # FIXME? $c->stash->{cobrand_alert_fields} = $c->cobrand->form_elements( '/alerts' ); $c->stash->{cobrand_update_fields} = $c->cobrand->form_elements( '/updateForm' ); @@ -187,7 +187,6 @@ sub format_problem_for_display : Private { sub generate_map_tags : Private { my ( $self, $c ) = @_; - my $map_links = ''; my $problem = $c->stash->{problem}; my ( $short_lat, $short_lon ) = @@ -196,7 +195,7 @@ sub generate_map_tags : Private { my $google_link = $c->cobrand->base_url_for_emails() . '/report/' . $problem->id; - $map_links = + $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 ) @@ -211,9 +210,7 @@ sub generate_map_tags : Private { pins => $problem->used_map ? [ [ $problem->latitude, $problem->longitude, 'blue' ] ] : [], - post => $map_links ); - $c->stash->{map_end_html} = FixMyStreet::Map::display_map_end(0), $c->stash->{map_js} = FixMyStreet::Map::header_js(); return 1; |