diff options
| author | Dave Arter <davea@mysociety.org> | 2018-01-15 17:44:27 +0000 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2018-02-08 16:04:54 +0000 |
| commit | fd97c61fcfea0c6f9dd3746b34048e9ddf27c4dd (patch) | |
| tree | 19b87f3e451af8b59aadc6eaa9eb16be8d77c857 | |
| parent | 2049ab505a16bddd67ab3603806208c0ad564f7b (diff) | |
Display report extra fields on inspect form
This commit restores display of report extra fields on the inspect form,
previously missing because of a typo. Also improves the compactness of
the form by hiding ‘notice’ extras and any extra guidance attached to
each field.
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | templates/web/base/report/_inspect.html | 4 | ||||
| -rw-r--r-- | templates/web/base/report/new/category_extras_fields.html | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 330b578c6..fa87a2fdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Change text on /reports to match lower down (fix translation). - Ensure all reports graph can't dip downward. #1956 - Fix error sending `requires_inspection` reports. #1961 + - Restore display of extra fields on inspector form. #1994 - Admin improvements: - Admin can anonymize/hide all a user's reports. #1942 #1943 - Admin can log a user out. #1975 diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index eb2564157..1893826de 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -65,9 +65,9 @@ data-defect-types='[% category_defect_types.$cat_name %]' data-templates='[% templates_by_category.$cat_name %]'> [% IF cat_name == problem.category %] - [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$category %] + [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$cat_name hide_notices=1 %] [% ELSE %] - [% INCLUDE 'report/new/category_extras_fields.html' metas=category_extras.$category report_meta='' %] + [% INCLUDE 'report/new/category_extras_fields.html' report_meta='' metas=category_extras.$cat_name hide_notices=1 %] [% END %] </p> [% END %] diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html index 9c2731730..5cbdcc524 100644 --- a/templates/web/base/report/new/category_extras_fields.html +++ b/templates/web/base/report/new/category_extras_fields.html @@ -5,7 +5,7 @@ <input type="hidden" value="" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"> - [% ELSE %] + [% ELSIF meta.variable != 'false' || NOT hide_notices %] <label for="[% cat_prefix %]form_[% meta_name %]">[% meta.description %]</label> [% IF field_errors.$meta_name %] |