faster prev/next methods (#68)

requirements.txt

@@ -1,6 +1,7 @@
 acdh-django-browsing>=2.0,<3
 django-autocomplete-light>=3.9,<4
 django-leaflet>=0.30.1,<1
+django-next-prev==1.1.0
 Django>=5.0.6,<6
 djangorestframework-gis>=1.0,<2
 geopandas>=1.0.1,<2

shps/models.py

@@ -10,6 +10,7 @@
 from django.core.serializers import serialize
 from django.urls import reverse
 from django.utils.text import slugify
+from next_prev import next_in_order, prev_in_order
 
 from idprovider.models import IdProvider
 from vocabs.models import SkosConcept
@@ -109,15 +110,15 @@ def get_createview_url(self):
         return reverse("shapes:source_create")
 
     def get_next(self):
-        next = Source.objects.filter(id__gt=self.id)
+        next = next_in_order(self)
         if next:
-            return next.first().id
+            return next.id
         return False
 
     def get_prev(self):
-        prev = Source.objects.filter(id__lt=self.id).order_by("-id")
+        prev = prev_in_order(self)
         if prev:
-            return prev.first().id
+            return prev.id
         return False
 
     def get_file_size(self):
@@ -304,15 +305,15 @@ def get_createview_url(self):
         return reverse("shapes:shape_create")
 
     def get_next(self):
-        next = TempSpatial.objects.filter(id__gt=self.id)
+        next = next_in_order(self)
         if next:
-            return next.first().id
+            return next.id
         return False
 
     def get_prev(self):
-        prev = TempSpatial.objects.filter(id__lt=self.id).order_by("-id")
+        prev = prev_in_order(self)
         if prev:
-            return prev.first().id
+            return prev.id
         return False
 
     def sq_km(self, ct=3035):

shps/templates/shps/source_detail.html

@@ -21,7 +21,7 @@
         <div class="col-md-2">
             {% if object.get_prev %}
             <h2 class="text-start">
-                <a href="{% url 'shapes:shape_detail' pk=object.get_prev %}">
+                <a href="{% url 'shapes:source_detail' pk=object.get_prev %}">
                     <i class="bi bi-chevron-left" title="previous"></i>
                 </a>
             </h2>
@@ -32,7 +32,7 @@ <h1 class="display-5 text-center">
                 {{ object }}
                 {% if user.is_audtenticated %}
                 <small>
-                    <a href="{% url 'shapes:shape_edit' pk=object.id %}">
+                    <a href="{% url 'shapes:source_edit' pk=object.id %}">
                         <i class="bi bi-pencil-square" title="Edit {{ object }}"></i>
                     </a>
                 </small>
@@ -43,7 +43,7 @@ <h1 class="display-5 text-center">
         <div class="col-md-2 text-end">
             <h2>
                 {% if object.get_next %}
-                <a href="{% url 'shapes:shape_detail' pk=object.get_next %}" style="float:right">
+                <a href="{% url 'shapes:source_detail' pk=object.get_next %}" style="float:right">
                     <i class="bi bi-chevron-right" title="next"></i>
                 </a>
             </h2>