+
{% map_fragment map_inst prefix=prefix page=request.GET.p %}
-
- {% with author=map_inst.get_author %}
- {% if author %}
- {% trans "by" %} {{ author }}
+
+ {% if map_inst.tags %}
+
+ {% for tag, label in map_inst.get_tags_display %}
+ - {{ label }}
+ {% endfor %}
+
{% endif %}
- {% endwith %}
+
+ {% with author=map_inst.get_author %}
+ {% if author %}
+
{% trans "by" %} {{ author }}
+ {% endif %}
+ {% endwith %}
+
{% endfor %}
diff --git a/umap/templates/umap/search_bar.html b/umap/templates/umap/search_bar.html
index 701a0fb0..17588e70 100644
--- a/umap/templates/umap/search_bar.html
+++ b/umap/templates/umap/search_bar.html
@@ -4,17 +4,19 @@
{% trans "Search maps" as default_placeholder %}
diff --git a/umap/tests/integration/test_edit_map.py b/umap/tests/integration/test_edit_map.py
index 7bc6ca5f..571829bf 100644
--- a/umap/tests/integration/test_edit_map.py
+++ b/umap/tests/integration/test_edit_map.py
@@ -226,3 +226,18 @@ def test_hover_tooltip_setting_should_be_persistent(live_server, map, page):
- text: always never on hover
""")
expect(page.locator(".umap-field-showLabel input[value=null]")).to_be_checked()
+
+
+def test_can_edit_map_tags(live_server, map, page):
+ map.settings["properties"]["tags"] = ["arts"]
+ map.edit_status = Map.ANONYMOUS
+ map.save()
+ page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+ page.get_by_role("button", name="Edit map name and caption").click()
+ page.get_by_text("Tags").click()
+ expect(page.get_by_label("Art and Culture")).to_be_checked()
+ page.get_by_label("Cycling").check()
+ with page.expect_response(re.compile("./update/settings/.*")):
+ page.get_by_role("button", name="Save").click()
+ saved = Map.objects.get(pk=map.pk)
+ assert saved.tags == ["arts", "cycling"]
diff --git a/umap/tests/test_views.py b/umap/tests/test_views.py
index 81ef0cc2..e13a9c9a 100644
--- a/umap/tests/test_views.py
+++ b/umap/tests/test_views.py
@@ -486,3 +486,27 @@ def test_cannot_search_deleted_map(client, map):
url = reverse("search")
response = client.get(url + "?q=Blé")
assert "Blé dur" not in response.content.decode()
+
+
+@pytest.mark.django_db
+def test_filter_by_tag(client, map):
+ # Very basic search, that do not deal with accent nor case.
+ # See install.md for how to have a smarter dict + index.
+ map.name = "Blé dur"
+ map.tags = ["bike"]
+ map.save()
+ url = reverse("search")
+ response = client.get(url + "?tags=bike")
+ assert "Blé dur" in response.content.decode()
+
+
+@pytest.mark.django_db
+def test_can_combine_search_and_filter(client, map):
+ # Very basic search, that do not deal with accent nor case.
+ # See install.md for how to have a smarter dict + index.
+ map.name = "Blé dur"
+ map.tags = ["bike"]
+ map.save()
+ url = reverse("search")
+ response = client.get(url + "?q=dur&tags=bike")
+ assert "Blé dur" in response.content.decode()
diff --git a/umap/views.py b/umap/views.py
index 0d05a75c..aed882bf 100644
--- a/umap/views.py
+++ b/umap/views.py
@@ -334,12 +334,18 @@ class TeamMaps(PaginatorMixin, DetailView):
class SearchMixin:
def get_search_queryset(self, **kwargs):
q = self.request.GET.get("q")
+ tags = [t for t in self.request.GET.getlist("tags") if t]
+ qs = Map.objects.all()
if q:
vector = SearchVector("name", config=settings.UMAP_SEARCH_CONFIGURATION)
query = SearchQuery(
q, config=settings.UMAP_SEARCH_CONFIGURATION, search_type="websearch"
)
- return Map.objects.annotate(search=vector).filter(search=query)
+ qs = qs.annotate(search=vector).filter(search=query)
+ if tags:
+ qs = qs.filter(tags__contains=tags)
+ if q or tags:
+ return qs
class Search(PaginatorMixin, TemplateView, PublicMapsMixin, SearchMixin):