umap-project 3.1.1__py3-none-any.whl → 3.1.2__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "3.1.1"
+VERSION = "3.1.2"

umap/views.py

@@ -26,6 +26,7 @@ from django.core.mail import send_mail
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.core.signing import BadSignature, Signer, TimestampSigner
 from django.core.validators import URLValidator, ValidationError
+from django.db.models import QuerySet
 from django.http import (
     Http404,
     HttpResponse,
@@ -330,10 +331,9 @@ class TeamMaps(PaginatorMixin, DetailView):
 
 
 class SearchMixin:
-    def get_search_queryset(self, qs=None, **kwargs):
+    def get_search_queryset(self, qs, **kwargs):
         q = self.request.GET.get("q")
         tags = [t for t in self.request.GET.getlist("tags") if t]
-        qs = qs or Map.public.all()
         if q:
             vector = SearchVector("name", config=settings.UMAP_SEARCH_CONFIGURATION)
             query = SearchQuery(
@@ -351,10 +351,10 @@ class Search(PaginatorMixin, TemplateView, PublicMapsMixin, SearchMixin):
     list_template_name = "umap/map_list.html"
 
     def get_context_data(self, **kwargs):
-        qs = self.get_search_queryset()
+        qs = self.get_search_queryset(Map.public.all())
         qs_count = 0
         results = []
-        if qs is not None:
+        if isinstance(qs, QuerySet):
             qs = qs.filter(share_status=Map.PUBLIC).order_by("-modified_at")
             qs_count = qs.count()
             results = self.paginate(qs)
@@ -382,7 +382,7 @@ class UserDashboard(PaginatorMixin, DetailView, SearchMixin):
     def get_maps(self):
         qs = Map.private.filter(is_template=False)
         search_qs = self.get_search_queryset(qs)
-        if search_qs is not None:
+        if isinstance(search_qs, QuerySet):
             qs = search_qs
         qs = qs.for_user(self.object)
         return qs.order_by("-modified_at")
@@ -404,7 +404,7 @@ class UserTemplates(PaginatorMixin, DetailView, SearchMixin):
     def get_maps(self):
         qs = Map.private.filter(is_template=True)
         search_qs = self.get_search_queryset(qs)
-        if search_qs is not None:
+        if isinstance(search_qs, QuerySet):
             qs = search_qs
         qs = qs.for_user(self.object)
         return qs.order_by("-modified_at")
@@ -1488,10 +1488,10 @@ class TemplateList(ListView):
         source = self.request.GET.get("source")
         if source == "mine":
             qs = Map.private.filter(is_template=True).for_user(self.request.user)
-        elif source == "community":
-            qs = Map.public.filter(is_template=True)
         elif source == "staff":
             qs = Map.public.starred_by_staff().filter(is_template=True)
+        else:
+            qs = Map.public.filter(is_template=True)
         templates = [
             {
                 "id": m.id,

{umap_project-3.1.1.dist-info → umap_project-3.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.1.1
+Version: 3.1.2
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>

{umap_project-3.1.1.dist-info → umap_project-3.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=23n-GUGPHwLgL365J9NykkSycnjtzzokGK0UtM_M89s,18
+umap/__init__.py,sha256=8Nl69Oi2XYElpzK4xxIF4SBxIpDfd8rEz6lcZYeXkq8,18
 umap/admin.py,sha256=YlK4CgEWb2eFYRKiklsKouxeiQ8z_b-H2Fv2XCaiGFQ,3014
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/asgi.py,sha256=sJkGqDLgMoPkq2nMRyRE_Hz3ZLJm1X5lgXiQJu6rYt0,660
@@ -12,7 +12,7 @@ umap/middleware.py,sha256=GsIFl0St_Rk5zjpE8dpGBlD0JL2AyMrNHu8SHylqwEg,1564
 umap/models.py,sha256=xANPE5gw3jjLartllGrc3GtEZ4en1NsG1WLS05blmRc,19914
 umap/urls.py,sha256=DQ932n0lyS-7eD8ubIaZtW2xjssSVuI7P0DWkClVFx4,7837
 umap/utils.py,sha256=WlTnzS2LUraYViSMsI2tf_0caq_yw_p8RLqpkjynf5E,6379
-umap/views.py,sha256=dwvJz4IcYNUI-S7Z9iU0lePJ2Pn-1vDbV9wIvqlzetU,50041
+umap/views.py,sha256=euGwHTW4Ynx8bUgeqJN_ieQ-V9T9wlVHTAfAn9ti8eY,50062
 umap/wsgi.py,sha256=IopIgnDZbCus3XpSetTHnra9VyzWi0Y2tJo-CmfTWCY,1132
 umap/bin/__init__.py,sha256=iA3ON4A6NCpenrn3q2OgefUKF5QRFIQS-FtS0pxruI8,234
 umap/locale/am_ET/LC_MESSAGES/django.mo,sha256=ZF_hEGHnrIX6XZBVqmWR4xbE5D8Y6s1GS5sYOxnFQBY,5377
@@ -596,8 +596,8 @@ umap/tests/integration/test_view_marker.py,sha256=NFCwNez__E_WsE1DuW5RuB0HVKDP4C
 umap/tests/integration/test_view_polygon.py,sha256=NMJC6Nt9VpQ8FIU9Pqq2OspHv49xsWlsoXCr8iBa0VA,2060
 umap/tests/integration/test_view_polyline.py,sha256=aJoXKmLhJaN0yhPdDCVskZNGx3q3mLDkjVPhZ30cadA,13959
 umap/tests/integration/test_websocket_sync.py,sha256=pbV7FmaBfjgFfKPIYwhHiaeSmR_tC3MqUYEReXLgSS4,28285
-umap_project-3.1.1.dist-info/METADATA,sha256=358AopMtoYl2vnxgt9UGmK5y85xjp38BLZFZWuEYfQc,3015
-umap_project-3.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-umap_project-3.1.1.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-3.1.1.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-3.1.1.dist-info/RECORD,,
+umap_project-3.1.2.dist-info/METADATA,sha256=Aijxj-vZQZa8zYrM6CEsfZtPuD-DQv7ByDG95PMRuaU,3015
+umap_project-3.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+umap_project-3.1.2.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-3.1.2.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-3.1.2.dist-info/RECORD,,