8 files changed, 42 insertions, 7 deletions
diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html
index 9bd85940b..eab0f4c49 100644
--- a/templates/web/base/admin/bodies.html
+++ b/templates/web/base/admin/bodies.html
@@ -20,7 +20,7 @@
   </p>
   [% END %]
 
-  <table cellspacing="0" cellpadding="2" border="1">
+  <table cellspacing="0" cellpadding="2" border="1" id="admin_bodies">
       <tr>
           <th>[% loc('Name') %]</th>
         [% IF c.cobrand.moniker == 'zurich' %]
diff --git a/templates/web/base/admin/list_updates.html b/templates/web/base/admin/list_updates.html
index d759a2354..4b8b26d3c 100644
--- a/templates/web/base/admin/list_updates.html
+++ b/templates/web/base/admin/list_updates.html
@@ -39,7 +39,11 @@
             <br>[% loc('Confirmed:') %] [% PROCESS format_time time=update.confirmed %]
         </small></td>
         <td>[% update.text | html %]</td> 
-        <td><a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a></td>
+        <td>
+            [% IF c.user.has_permission_to('report_edit', update.problem.bodies_str_ids) %]
+                <a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a>
+            [% END %]
+        </td>
     </tr>
 [% END -%]
 </table>
diff --git a/templates/web/base/admin/open311-form-fields.html b/templates/web/base/admin/open311-form-fields.html
index d1067205c..6e6eb96f0 100644
--- a/templates/web/base/admin/open311-form-fields.html
+++ b/templates/web/base/admin/open311-form-fields.html
@@ -49,6 +49,17 @@
   </p>
 
   [% IF show_body_fields %]
+    <div class="admin-hint">
+      <p>
+        [% loc(
+            "Enabling this will suppress the error message that is normally emitted when an update has no description"
+        ) %]
+      </p>
+    </div>
+    <p>
+        <input type="checkbox" id="blank_updates_permitted" name="blank_updates_permitted"[% ' checked' IF object.blank_updates_permitted %]>
+        <label for="blank_updates_permitted" class="inline">[% loc('Permit blank updates') %]</label>
+    </p>
     [%# These fields aren't shown for contacts %]
     <div class="admin-hint">
       <p>
@@ -68,6 +79,21 @@
     <div class="admin-hint">
       <p>
         [% loc(
+            "Enable <strong>Open311 problem-fetching</strong> if you want to display reports created at
+          the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.
+          For more information, see 
+          <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
+        ) %]
+      </p>
+    </div>
+    <p>
+        <input type="checkbox" id="fetch_problems" name="fetch_problems"[% ' checked' IF object.fetch_problems %]>
+        <label for="fetch_problems" class="inline">[% loc('Use Open311 problem fetching') %]</label>
+    </p>
+
+    <div class="admin-hint">
+      <p>
+        [% loc(
           "If you've enabled Open311 update-sending above, you must identify which 
           FixMyStreet <strong>user</strong> will be attributed as the creator of those updates
           when they are shown on the site. Enter the ID (number) of that user."
diff --git a/templates/web/base/admin/problem_row.html b/templates/web/base/admin/problem_row.html
index 446e94d66..99142af4e 100644
--- a/templates/web/base/admin/problem_row.html
+++ b/templates/web/base/admin/problem_row.html
@@ -38,6 +38,10 @@
             [%- IF problem.is_closed %]<br>[% prettify_state('closed') %]: [% PROCESS format_time time=problem.lastupdate %][% END -%]
             [%- IF problem.is_open %]<br>[% loc('Last&nbsp;update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
         </small></td>
-        <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
+        <td>
+            [% IF c.user.has_permission_to('report_edit', problem.bodies_str_ids) %]
+                <a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a>
+            [% END %]
+        </td>
     </tr>
 [%- END -%]
diff --git a/templates/web/base/admin/report-category.html b/templates/web/base/admin/report-category.html
index a2290089b..2d9ffcdb1 100644
--- a/templates/web/base/admin/report-category.html
+++ b/templates/web/base/admin/report-category.html
@@ -4,9 +4,9 @@
         <option selected value="[% problem.category | html %]">[% (problem.category_display OR '-') | html %]</option>
     </optgroup>
   [% END %]
-  [% IF category_options_copy.size %]
+  [% IF category_options.size %]
     <optgroup label="[% loc('Available categories') %]">
-      [% FOREACH cat IN category_options_copy %]
+      [% FOREACH cat IN category_options %]
         <option value="[% cat.name | html %]"[% ' selected' IF problem.category == cat.name %]>[% cat.value | html %]</option>
       [% END %]
     </optgroup>
diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index e2bdbb01a..e2bdbb01a 100644..100755
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 111e71283..6923dbb1a 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -58,7 +58,7 @@
           [% INCLUDE 'admin/report-category.html' %]
         </p>
 
-        [% FOREACH category IN category_options_copy %]
+        [% FOREACH category IN category_options %]
           [% cat_name = category.name;
              cat_prefix = cat_name | lower | replace('[^a-z]', '');
              cat_prefix = "category_" _ cat_prefix _ "_" %]
diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html
index ca5cb1461..cf5cc37b4 100644
--- a/templates/web/base/report/new/category_extras_fields.html
+++ b/templates/web/base/report/new/category_extras_fields.html
@@ -1,7 +1,7 @@
 [%- FOR meta IN metas %]
   [%- meta_name = meta.code -%]
 
-  [% IF c.cobrand.category_extra_hidden(meta_name) AND NOT show_hidden %]
+  [% IF c.cobrand.category_extra_hidden(meta) AND NOT show_hidden %]
 
       <input type="hidden" value="[% report_meta.$meta_name.value | html %]" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]">
 
@@ -14,6 +14,7 @@
       [% IF meta.variable != 'false' %]
         [% IF meta.exists('values') %]
           <select class="form-control" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
+            <option value="">[% loc('-- Pick an option --') %]</option>
             [% FOR option IN meta.values %]
               <option value="[% option.key %]"[% IF option.key == report_meta.$meta_name.value %] selected[% END %]>[% option.name %]</option>
             [% END %]