diff options
author | Dave Arter <davea@mysociety.org> | 2018-02-23 11:08:57 +0000 |
---|---|---|
committer | Dave Arter <davea@mysociety.org> | 2018-04-10 10:42:34 +0100 |
commit | edef401ff68cbf9f2e0aee5c489b2d8dce25b06a (patch) | |
tree | 8d461692ff0b375658a786f370668e845c20a2a8 | |
parent | f849988a45a545e6d4b9e9a80606ea7f7e6bac36 (diff) |
[BANES] Rename usrn field to site_code
To match the more generic changes in open311-adapter
-rw-r--r-- | perllib/FixMyStreet/Cobrand/BathNES.pm | 10 | ||||
-rw-r--r-- | web/cobrands/bathnes/js.js | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm index 38a5eec93..53d3b977e 100644 --- a/perllib/FixMyStreet/Cobrand/BathNES.pm +++ b/perllib/FixMyStreet/Cobrand/BathNES.pm @@ -93,8 +93,10 @@ sub map_js_extra { sub category_extra_hidden { my ($self, $meta) = @_; - return 1 if $meta eq 'unitid' || $meta eq 'asset_details'; - return 0; + my $code = $meta->{code}; + # These two are used in the non-Open311 'Street light fault' category. + return 1 if $code eq 'unitid' || $code eq 'asset_details'; + return $self->SUPER::category_extra_hidden($meta); } sub open311_config { @@ -113,10 +115,10 @@ sub open311_config { # value because we don't display the adopted highways layer on those # frontends. Instead we'll look up the closest asset from the WFS # service at the point we're sending the report over Open311. - if (!$row->get_extra_field_value('usrn')) { + if (!$row->get_extra_field_value('site_code')) { if (my $usrn = $self->lookup_usrn($row)) { push @$extra, - { name => 'usrn', + { name => 'site_code', value => $usrn }; } } diff --git a/web/cobrands/bathnes/js.js b/web/cobrands/bathnes/js.js index 82f978def..89316de4e 100644 --- a/web/cobrands/bathnes/js.js +++ b/web/cobrands/bathnes/js.js @@ -184,7 +184,7 @@ fixmystreet.assets.add($.extend(true, {}, fixmystreet.maps.banes_defaults, { always_visible: true, usrn: { attribute: 'usrn', - field: 'usrn' + field: 'site_code' }, name: "Adopted Highways" })); |