Mandatory defect type selection if defect raised.

And there are entries in the defect type dropdown.

2 files changed, 9 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index daf4fea1f..1d070c62f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@
         - Fix issue with category filter when category contains comma #2166
         - Inspectors can unset priority. #2171
         - Defect type is recorded if category change made. #2172
+    - Admin improvements:
+        - Mandatory defect type selection if defect raised.
     - Open311 improvements:
         - CLOSED status maps to 'closed' state if extended statuses are enabled.
 
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 824e8fa0b..2f2de7b20 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -84,11 +84,18 @@ $.extend(fixmystreet.set_up, {
         if ($(this).val() !== "action scheduled") {
             $("#js-inspect-action-scheduled").addClass("hidden");
             $('#raise_defect_yes').prop('required', false);
+            $('#defect_type').prop('required', false);
         } else {
             $("#js-inspect-action-scheduled").removeClass("hidden");
             $('#raise_defect_yes').prop('required', true);
+            var dt_required = $('#defect_type')[0].length > 1 && $('input[name=raise_defect]:checked').val();
+            $('#defect_type').prop('required', dt_required ? true : false);
         }
     });
+    $('input[name=raise_defect]').change(function() {
+        var dt_required = $('#defect_type')[0].length > 1 && this.value;
+        $('#defect_type').prop('required', dt_required ? true : false);
+    });
   },
 
   list_item_actions: function() {