diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 15ba18df4..cd98b233b 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -454,9 +454,11 @@ $.extend(fixmystreet.set_up, { if (data && data.non_public) { $(".js-hide-if-private-category").hide(); $(".js-hide-if-public-category").removeClass("hidden-js").show(); + $('#form_non_public').prop('checked', true).prop('disabled', true); } else { $(".js-hide-if-private-category").show(); $(".js-hide-if-public-category").hide(); + $('#form_non_public').prop('checked', false).prop('disabled', false); } if (data && data.allow_anonymous) { $('.js-show-if-anonymous').removeClass('hidden-js'); @@ -1362,7 +1364,10 @@ fixmystreet.fetch_reporting_data = function() { } $('#form_category_row').html(data.category); - if ($("#form_category option[value=\"" + old_category + "\"]").length) { + var cat_in_group = $("#form_category optgroup[label=\"" + old_category_group + "\"] option[value=\"" + old_category + "\"]"); + if (cat_in_group.length) { + cat_in_group.prop({selected:true}); + } else if ($("#form_category option[value=\"" + old_category + "\"]").length) { $("#form_category").val(old_category); } else if (filter_category !== undefined && $("#form_category option[value='" + filter_category + "']").length) { // If the category filter appears on the map and the user has selected |