diff options
author | Matthew Somerville <matthew@mysociety.org> | 2020-06-15 13:19:22 +0100 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2020-06-16 14:38:18 +0100 |
commit | a2b1c1a19327fea4c9a0688cf67affb34ce08726 (patch) | |
tree | cdd87339ee7765ed75df7416dde199776c3d8b27 | |
parent | dae0ca4686c5613800df5bb792fe803b952f6bde (diff) |
[UK Councils] Config matches default.
With the refactor to make sure asset message always uses the default, no
need for these specific config lines any more.
-rw-r--r-- | .cypress/cypress/integration/peterborough.js | 2 | ||||
-rw-r--r-- | web/cobrands/buckinghamshire/assets.js | 1 | ||||
-rw-r--r-- | web/cobrands/cheshireeast/assets.js | 3 | ||||
-rw-r--r-- | web/cobrands/hounslow/assets.js | 1 | ||||
-rw-r--r-- | web/cobrands/peterborough/assets.js | 1 |
5 files changed, 2 insertions, 6 deletions
diff --git a/.cypress/cypress/integration/peterborough.js b/.cypress/cypress/integration/peterborough.js index be1515028..452795d8c 100644 --- a/.cypress/cypress/integration/peterborough.js +++ b/.cypress/cypress/integration/peterborough.js @@ -33,7 +33,7 @@ describe('new report form', function() { it('correctly changes the asset select message', function() { cy.get('select:eq(4)').select('Street lighting'); - cy.get('.category_meta_message').should('contain', 'You can pick a street light from the map'); + cy.get('.category_meta_message').should('contain', 'You can pick a light from the map'); cy.get('select:eq(4)').select('Trees'); cy.get('.category_meta_message').should('contain', 'You can pick a tree from the map'); }); diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js index 2ac084193..7c8995e41 100644 --- a/web/cobrands/buckinghamshire/assets.js +++ b/web/cobrands/buckinghamshire/assets.js @@ -61,7 +61,6 @@ var labeled_defaults = $.extend(true, {}, defaults, { select_action: true, feature_code: 'feature_id', stylemap: streetlight_stylemap, - asset_item_message: 'You can pick a <b class="asset-spot">ITEM</b> from the map »', construct_asset_name: function(id) { var code = id.replace(/[O0-9]+[A-Z]*/g, ''); return {id: id, name: streetlight_code_to_type[code]}; diff --git a/web/cobrands/cheshireeast/assets.js b/web/cobrands/cheshireeast/assets.js index d9eb25821..4e5df342d 100644 --- a/web/cobrands/cheshireeast/assets.js +++ b/web/cobrands/cheshireeast/assets.js @@ -42,8 +42,7 @@ fixmystreet.assets.add(labeled_defaults, { filter_key: 'feature_gr', filter_value: 'LCOL', asset_group: 'Street lights', - asset_item: 'street light', - asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map »' + asset_item: 'street light' }); fixmystreet.assets.add(defaults, { diff --git a/web/cobrands/hounslow/assets.js b/web/cobrands/hounslow/assets.js index 375a74e3f..9521d73b8 100644 --- a/web/cobrands/hounslow/assets.js +++ b/web/cobrands/hounslow/assets.js @@ -136,7 +136,6 @@ var labeled_defaults = $.extend(true, {}, defaults, { select_action: true, stylemap: streetlight_stylemap, feature_code: 'FeatureId', - asset_item_message: 'You can pick a <b class="asset-spot">ITEM</b> from the map »', construct_asset_name: function(id) { if (id.split) { var code = id.split("/").slice(-1)[0]; diff --git a/web/cobrands/peterborough/assets.js b/web/cobrands/peterborough/assets.js index 3d718116e..1da72264d 100644 --- a/web/cobrands/peterborough/assets.js +++ b/web/cobrands/peterborough/assets.js @@ -143,7 +143,6 @@ fixmystreet.assets.add(light_defaults, { options.category !== UNKNOWN_LIGHT_CATEGORY_NAME ) || options.category === "Lighting enquiry"; }, - asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map »', select_action: true, actions: { asset_found: function(asset) { |