From 395bf81b39cec7f706132837d39c75242070a088 Mon Sep 17 00:00:00 2001
From: Hakim Cassimally <hakim@mysociety.org>
Date: Thu, 4 Dec 2014 17:16:28 +0000
Subject: Open311: honour `variable` field in form display

Potentially addresses #42 and
https://github.com/mysociety/FixMyStreet-Commercial/issues/647
---
 templates/web/base/report/new/category_extras.html     | 16 +++++++++-------
 .../web/fixmystreet/report/new/category_extras.html    | 18 ++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html
index 928b61041..6b15cbef9 100644
--- a/templates/web/base/report/new/category_extras.html
+++ b/templates/web/base/report/new/category_extras.html
@@ -11,14 +11,16 @@
 
     <div class="form-field">
         <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label>
-        [% IF meta.exists('values') %]
-        <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
-            [% FOR option IN meta.values.value.value %]
-                <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
+        [% IF meta.variable != 'false' %]
+            [% IF meta.exists('values') 
+            <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
+                [% FOR option IN meta.values.value.value %]
+                    <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
+                [% END %]
+            </select>
+            [% ELSE %]
+            <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
             [% END %]
-        </select>
-        [% ELSE %]
-        <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
         [% END %]
     </div>
         [%- END %]
diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html
index ae1214c35..48a38435d 100644
--- a/templates/web/fixmystreet/report/new/category_extras.html
+++ b/templates/web/fixmystreet/report/new/category_extras.html
@@ -9,14 +9,16 @@
             [% IF field_errors.$meta_name %]
                 <p class='form-error'>[% field_errors.$meta_name %]</p>
             [% END -%]
-            [% IF meta.exists('values') %]
-                <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
-                    [% FOR option IN meta.values.value %]
-                        <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
-                    [% END %]
-                </select>
-            [% ELSE %]
-                <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
+            [% IF meta.variable != 'false' %]
+                [% IF meta.exists('values') %]
+                    <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
+                        [% FOR option IN meta.values.value %]
+                            <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
+                        [% END %]
+                    </select>
+                [% ELSE %]
+                    <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
+                [% END %]
             [% END %]
     
         [%- END %]
-- 
cgit v1.2.3