aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2011-05-26 12:07:56 +0100
committerStruan Donald <struan@exo.org.uk>2011-05-26 12:07:56 +0100
commit32409e7f05da1c7f07db4be0b41f7746856156de (patch)
treef6943914e179a66de6fc21e48f86ac6b5e688f63
parentef19fcc2ce206f64635e103527e4c7957896e853 (diff)
remove redundant variable from stash and do check directly in template
-rw-r--r--perllib/FixMyStreet/App/Controller/Report.pm2
-rw-r--r--templates/web/default/report/display.html4
2 files changed, 2 insertions, 4 deletions
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/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 %]