Merge branch 'main' into vector_table

paviliondev · Nov 28, 2023 · 63050c2 · 63050c2
2 parents 617ee8a + e203985
commit 63050c2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.discourse-compatibility b/.discourse-compatibility
@@ -1 +1 @@
-3.1.999: ee6a34482cc35006a11dc4acb338ee7c998c5774
+3.1.999: 58c5eabb47237b1485e76c93501433ee02011430
diff --git 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
@@ -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: [email protected]
 # url: https://github.com/angusmcleod/discourse-locations

diff --git 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(