diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 16 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 6 |
2 files changed, 21 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 32ba7f1ca..75c96f53d 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -238,6 +238,7 @@ sub format_problem_for_display : Private { $c->stash->{detail} = \@detail; $c->forward('generate_map_tags'); + $c->forward('generate_problem_photo'); $c->forward('generate_problem_meta'); return 1; @@ -263,6 +264,21 @@ sub generate_map_tags : Private { return 1; } + +sub generate_problem_photo : Private { + my ( $self, $c ) = @_; + + my $problem = $c->stash->{problem}; + + if ( $c->cobrand->allow_photo_display and $problem->photo ) { + my $photo = {}; + ( $photo->{width}, $photo->{height} ) = + Image::Size::imgsize( \$problem->photo ); + $photo->{url} = '/photo/?id=' . $problem->id; + $c->stash->{photo} = $photo; + } +} + sub generate_problem_meta : Private { my ( $self, $c ) = @_; diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 5c89bd471..edec4743c 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -21,7 +21,11 @@ </p> [% END %] -{{ $problem_photo }} +[% IF photo %] +<p align="center"> + <img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% photo.url %]"> +</p> +[% END %] <p align="right"> <small> |