[UK Councils] Fix undefined body_validation_rules.

The core validation_rules.js is not included on e.g. the front page.

3 files changed, 22 insertions, 25 deletions

diff --git a/web/cobrands/fixmystreet-uk-councils/council_validation_rules.js b/web/cobrands/fixmystreet-uk-councils/council_validation_rules.js
index 1421687f8..b9a4ed252 100644
--- a/web/cobrands/fixmystreet-uk-councils/council_validation_rules.js
+++ b/web/cobrands/fixmystreet-uk-councils/council_validation_rules.js
@@ -12,27 +12,26 @@ confirm_validation_rules = {
     }
 };
 
-body_validation_rules['Buckinghamshire County Council'] = confirm_validation_rules;
-body_validation_rules['Lincolnshire County Council'] = confirm_validation_rules;
-body_validation_rules['Bath and North East Somerset Council'] = confirm_validation_rules;
-
-body_validation_rules['Rutland County Council'] = {
-    name: {
-      required: true,
-      maxlength: 40
-    }
-};
-
-body_validation_rules['Bromley Council'] = {
-    detail: {
-      required: true,
-      maxlength: 1750
-    }
-};
-
-body_validation_rules['Oxfordshire County Council'] = {
-    detail: {
-      required: true,
-      maxlength: 1700
+body_validation_rules = {
+    'Buckinghamshire County Council': confirm_validation_rules,
+    'Lincolnshire County Council': confirm_validation_rules,
+    'Bath and North East Somerset Council': confirm_validation_rules,
+    'Rutland County Council': {
+        name: {
+          required: true,
+          maxlength: 40
+        }
+    },
+    'Bromley Council': {
+        detail: {
+          required: true,
+          maxlength: 1750
+        }
+    },
+    'Oxfordshire County Council': {
+        detail: {
+          required: true,
+          maxlength: 1700
+        }
     }
 };
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index c15fe0375..98e538933 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -437,7 +437,7 @@ $.extend(fixmystreet.set_up, {
         // apply new validation rules
         fixmystreet.set_up.reapply_validation(core_validation_rules);
         $.each(data.bodies, function(index, body) {
-            if ( body_validation_rules[body] ) {
+            if ( typeof body_validation_rules !== 'undefined' && body_validation_rules[body] ) {
                 var rules = body_validation_rules[body];
                 fixmystreet.set_up.reapply_validation(rules);
             }
diff --git a/web/js/validation_rules.js b/web/js/validation_rules.js
index b8f09ef1e..3e7b010f2 100644
--- a/web/js/validation_rules.js
+++ b/web/js/validation_rules.js
@@ -10,6 +10,4 @@
         }
     };
 
-    body_validation_rules = {};
-
     validation_rules = core_validation_rules;