From 39f91c97829ecbecf160c14f5df267c1d836c314 Mon Sep 17 00:00:00 2001 From: Robert <35533304+merefield@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:13:13 +0000 Subject: [PATCH 1/3] Move Stable back a few commits to resolve breakage --- .discourse-compatibility | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.discourse-compatibility b/.discourse-compatibility index 13cb7d92..dafd53da 100644 --- a/.discourse-compatibility +++ b/.discourse-compatibility @@ -1 +1 @@ -3.1.999: ee6a34482cc35006a11dc4acb338ee7c998c5774 +3.1.999: 58c5eabb47237b1485e76c93501433ee02011430 From 3dc60300a50c3a037f443b5860f9f69524425428 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Tue, 21 Nov 2023 21:56:00 +0100 Subject: [PATCH 2/3] DEV: Update `visit` path in a test Omitting `/` prefix was incorrect and could break in the future (see: https://github.com/discourse/discourse/pull/24445) --- test/javascripts/acceptance/map-to-do.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/javascripts/acceptance/map-to-do.js b/test/javascripts/acceptance/map-to-do.js index dfb50c65..a2d76915 100644 --- a/test/javascripts/acceptance/map-to-do.js +++ b/test/javascripts/acceptance/map-to-do.js @@ -23,7 +23,7 @@ acceptance("Topic Map - Show Correct Population", function (needs) { }); test("Category map includes the right topics", async function (assert) { - await visit("c/general/announcements/24/l/map"); + await visit("/c/general/announcements/24/l/map"); assert.ok( exists( From e48524d360c9071ccfbd177313b2b8160fe8b0d3 Mon Sep 17 00:00:00 2001 From: merefield Date: Tue, 28 Nov 2023 22:54:47 +0000 Subject: [PATCH 3/3] prettier and bump patch --- assets/javascripts/discourse/components/locations-map.js | 5 ++++- plugin.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/javascripts/discourse/components/locations-map.js b/assets/javascripts/discourse/components/locations-map.js index f7194828..cf284774 100644 --- a/assets/javascripts/discourse/components/locations-map.js +++ b/assets/javascripts/discourse/components/locations-map.js @@ -264,7 +264,10 @@ export default class LocationMapComponent extends Component { } if ( this.searchFilterType === "name" && - !(user.name && user.name.toLowerCase().indexOf(this.searchFilter.toLowerCase()) > -1) + !( + user.name && + user.name.toLowerCase().indexOf(this.searchFilter.toLowerCase()) > -1 + ) ) { return false; } diff --git a/plugin.rb b/plugin.rb index 2a933198..3d58d184 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # name: discourse-locations # about: Tools for handling locations in Discourse -# version: 6.4.1 +# version: 6.4.2 # authors: Angus McLeod, Robert Barrow # contact_emails: development@pavilion.tech # url: https://github.com/angusmcleod/discourse-locations