diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 2 | ||||
| -rwxr-xr-x | templates/web/default/around/display_location.html | 2 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index f41cdf212..073bd7ab7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ inc/ .sass-cache _Inline/ lib +tags
\ No newline at end of file diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 82d83e318..b21f069c3 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -109,8 +109,6 @@ 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; # FIXME? - $c->stash->{cobrand_alert_fields} = $c->cobrand->form_elements('/alerts'); $c->stash->{cobrand_update_fields} = $c->cobrand->form_elements('/updateForm'); diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index f9a9bdc51..f78c6fd25 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -9,7 +9,7 @@ : c.uri_for( "/rss/l/$short_latitude,$short_longitude" ); email_url = c.uri_for( - '/alert', + '/alert/list', { lat => short_latitude, lon => short_longitude, diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index ef51dca01..4adaa23cd 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -70,7 +70,7 @@ [% INCLUDE 'errors.html' %] - <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" id="fieldset"[% IF allow_photo_upload %] enctype="multipart/form-data"[% END %]> + <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" id="fieldset"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]> <input type="hidden" name="submit_update" value="1"> <input type="hidden" name="id" value="[% problem.id | html %]"> @@ -111,7 +111,7 @@ [% END %] - [% IF allow_photo_upload %] + [% IF c.cobrand.allow_photo_upload %] [% IF photo_error %] <div class='form-error'>[% photo_error %]</div> [% END %] |