apply suggestions

Author: PartyNell

mapentity/models.py

@@ -283,8 +283,10 @@ def get_detail_url(self):
         return reverse(self._entity.url_name(ENTITY_DETAIL), args=[str(self.pk)])
 
     def get_popup_url(self):
-        modelname = self._meta.model_name.lower()
-        return f"/api/{modelname}/drf/{modelname}s/{self.pk}/popup_content"
+        return reverse(
+            f"{self._meta.app_label.lower()}:{self._meta.model_name.lower()}-drf-popup-content",
+            kwargs={"pk": self.pk},
+        )
 
     @property
     def map_image_url(self):

mapentity/serializers/__init__.py

@@ -5,12 +5,13 @@
     MapentityGeojsonModelSerializer,
 )
 from .gpx import GPXSerializer
-from .helpers import json_django_dumps, plain_text, smart_plain_text
+from .helpers import field_as_string, json_django_dumps, plain_text, smart_plain_text
 from .shapefile import ZipShapeSerializer
 
 __all__ = [
     "plain_text",
     "smart_plain_text",
+    "field_as_string",
     "CSVSerializer",
     "GPXSerializer",
     "MapentityDatatableSerializer",

mapentity/serializers/helpers.py

@@ -27,6 +27,9 @@ def field_as_string(obj, field, ascii=False):
             or isinstance(value, Decimal)
         ):
             value = number_format(value)
+        if hasattr(value, "all"):
+            # convert ManyRelatedManager to QuerySet
+            value = value.all()
         if isinstance(value, list) or isinstance(value, QuerySet):
             value = ", ".join([str(val) for val in value])
     return smart_plain_text(value, ascii)

mapentity/static/mapentity/leaflet-objectslayer.js

@@ -246,8 +246,7 @@ L.ObjectsLayer = L.GeoJSON.extend({
         } else {
             // parse data
             try {
-                var json = await response.json();
-                return json.data;
+                return response.json();
             } catch (error) {
                 throw new Error('Cannot parse data');
             }

mapentity/templates/mapentity/mapentity_popup_content.html

@@ -2,7 +2,7 @@
     <p class="text-center m-0 p-2"><strong>{{ title }}</strong></p>
     {% if attributes %}
         <p>
-            {% for field in attributes %}{{ field }}<br>{% endfor %}
+            {% for field in attributes %}{{ field|truncatechars:100 }}<br>{% endfor %}
         </p>
     {% endif %}
     <button id="detail-btn" class="btn btn-sm btn-info" onclick="window.location.href='{{ detail_url }}'">{{ button_label }}</button>

mapentity/tests/__init__.py

@@ -452,19 +452,11 @@ def test_api_popup_content(self):
             return  # Abstract test should not run
 
         self.obj = self.modelfactory.create()
-        popup_url = f"/api/{self.model._meta.model_name}/drf/{self.model._meta.model_name}s/{self.obj.pk}/popup_content"
+        popup_url = self.obj.get_popup_url()
         response = self.client.get(popup_url)
         self.assertEqual(response.status_code, 200, f"{popup_url} not found")
         content_json = response.json()
-        self.assertEqual(
-            content_json,
-            {
-                "data": self.get_expected_popup_content(),
-                "draw": 1,
-                "recordsFiltered": 1,
-                "recordsTotal": 1,
-            },
-        )
+        self.assertEqual(content_json, self.get_expected_popup_content())
 
 
 class MapEntityLiveTest(LiveServerTestCase):

mapentity/views/api.py

@@ -2,8 +2,6 @@
 
 from django.conf import settings
 from django.contrib.gis.db.models.functions import Transform
-from django.core.exceptions import FieldDoesNotExist
-from django.db import models
 from django.template import loader
 from django.utils.translation import gettext_lazy as _
 from django_filters.rest_framework import DjangoFilterBackend
@@ -98,38 +96,18 @@ def filter_infos(self, request, *args, **kwargs):
             }
         )
 
-    @action(detail=True, methods=["get"])
+    @action(
+        detail=True,
+        methods=["get"],
+        url_path="popup-content",
+        renderer_classes=[renderers.JSONRenderer],
+    )
     def popup_content(self, request, *args, **kwargs):
         obj = self.get_object()
         model_name = self.model.__name__.lower()
         label_config = getattr(settings, "POPUP_CONTENT", {})
         fields = label_config.get(model_name, []).copy()
 
-        def get_field_value(obj, field):
-            try:
-                modelfield = self.model._meta.get_field(field)
-            except FieldDoesNotExist:
-                modelfield = None
-
-            value = getattr(obj, field + "_display", getattr(obj, field, None))
-            if isinstance(value, bool):
-                field_name = obj._meta.get_field(field).verbose_name
-                value = f"{field_name}: " + (_("no"), _("yes"))[value]
-
-            if isinstance(modelfield, models.ManyToManyField) and not isinstance(
-                value, str
-            ):
-                value = ", ".join([str(val) for val in value.all()])
-
-            return mapentity_serializers.smart_plain_text(value, ascii)
-
-        def clean_value(value):
-            if isinstance(value, str):
-                # truncate long text (around 2 rows)
-                if len(value) > 100:
-                    value = value[:100] + "..."
-            return value
-
         context = {
             "button_label": _("Detail sheet"),
             "detail_url": obj.get_detail_url(),
@@ -138,9 +116,18 @@ def clean_value(value):
         }
 
         for field_name in fields:
-            value = get_field_value(obj, field_name)
+            try:
+                value = mapentity_serializers.field_as_string(obj, field_name)
+            except AttributeError:
+                # ignore fields that are not available without raising an error
+                value = None
+
+            # add field name for boolean field for readability
+            if value in [_("yes"), _("no")]:
+                value = f"{field_name}: {value}"
+
             if value:
-                context["attributes"].append(clean_value(value))
+                context["attributes"].append(value)
 
         template = loader.get_template("mapentity/mapentity_popup_content.html")
         return Response(template.render(context))

mapentity/views/base.py

@@ -113,7 +113,7 @@ def __str__(self):
         dictsettings["urls"]["static"] = settings.STATIC_URL
         dictsettings["urls"]["layer"] = options.model.get_layer_url()
         dictsettings["urls"]["detail"] = f"{root_url}modelname/0/"
-        dictsettings["urls"]["popup"] = "/api/modelname/drf/modelnames/0/popup_content"
+        dictsettings["urls"]["popup"] = "/api/modelname/drf/modelnames/0/popup-content"
         dictsettings["urls"]["format_list"] = (
             f"{root_url}{options._url_path(mapentity_models.ENTITY_FORMAT_LIST)[1:-1]}"
         )

test_project/test_app/tests/test_views.py

@@ -72,7 +72,7 @@ def get_expected_popup_content(self):
             f'<div class="d-flex flex-column justify-content-center">\n'
             f'    <p class="text-center m-0 p-2"><strong>a dummy model (1)</strong></p>\n    \n'
             f"        <p>\n"
-            f"            a dummy model with a dummy name, a dummy geom, dummy tags, dummy makinins. It is the perfect object ...<br>public: no<br>{self.obj.tags.first().label}<br>a dummy model<br>\n"
+            f"            a dummy model with a dummy name, a dummy geom, dummy tags, dummy makinins. It is the perfect object…<br>public: no<br>{self.obj.tags.first().label}<br>a dummy model<br>\n"
             f"        </p>\n    \n"
             f'    <button id="detail-btn" class="btn btn-sm btn-info" onclick="window.location.href=\'/dummymodel/{self.model.objects.first().pk}/\'">Detail sheet</button>\n'
             f"</div>"
@@ -301,7 +301,7 @@ def test_js_settings_urls(self):
                 "layer": "/api/modelname/drf/modelnames.geojson",
                 "screenshot": "/map_screenshot/",
                 "detail": "/modelname/0/",
-                "popup": "/api/modelname/drf/modelnames/0/popup_content",
+                "popup": "/api/modelname/drf/modelnames/0/popup-content",
                 "format_list": "/modelname/list/export/",
                 "static": "/static/",
                 "root": "/",