diff options
| -rw-r--r-- | perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm | 8 | ||||
| -rw-r--r-- | web/cobrands/buckinghamshire/assets.js | 15 |
2 files changed, 23 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm b/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm index dd44b9651..ce32b0d93 100644 --- a/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm +++ b/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm @@ -138,9 +138,17 @@ sub close_problems { return unless $opts->{commit}; my $problems = shift; + + return unless $problems->count; + my $extra = { auto_closed_by_script => 1 }; $extra->{is_superuser} = 1 if !$opts->{user_name}; + # need to do this again in case no reports were closed with an + # email in which case we won't have set the lang and domain + my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($opts->{cobrand})->new(); + $cobrand->set_lang_and_domain($problems->first->lang, 1); + while (my $problem = $problems->next) { my $timestamp = \'current_timestamp'; my $comment = $problem->add_to_comments( { diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js index 7fb0f8833..3c030cb18 100644 --- a/web/cobrands/buckinghamshire/assets.js +++ b/web/cobrands/buckinghamshire/assets.js @@ -465,5 +465,20 @@ fixmystreet.assets.add($.extend(true, {}, defaults, { } })); +function check_rights_of_way() { + var relevant_body = OpenLayers.Util.indexOf(fixmystreet.bodies, defaults.body) > -1; + var relevant_cat = $('#form_category').val() == 'Rights of Way'; + + if (!relevant_body || !relevant_cat) { + $('#row-message').remove(); + $('.js-hide-if-invalid-category').show(); + return; + } + + var $msg = $('<p id="row-message" class="box-warning">If you wish to report an issue on a Public Right of Way, please use <a href="https://www.buckscc.gov.uk/services/environment/public-rights-of-way/report-a-rights-of-way-issue/">this service</a>.</p>'); + $('#form_category_row').after($msg); + $('.js-hide-if-invalid-category').hide(); +} +$(fixmystreet).on('report_new:category_change', check_rights_of_way); })(); |