Merge branch 'master' into improve-get-source-filtered

Terralego · Feb 6, 2024 · 44f7b5f · 44f7b5f
2 parents 848a8a9 + 2656fd1
commit 44f7b5f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/docs/source/others/changelog.rst b/docs/source/others/changelog.rst
@@ -3,16 +3,24 @@ Changelog
 ==========
 
 
-2024.02.3+dev  (XXXX-XX-XX)
+2024.02.4+dev  (XXXX-XX-XX)
 ---------------------------
 
 **Improvements:**
 
-- Add "In progress" status to source
-- Source list endpoint now also return ids of related layer
-- Add author to Source
-- Api result for sources are now filterable by model type and status
-- Api result for sources Sources are now sortable by updated date
+- Sources in admin can now be sorted / filtered by model type and update date
+
+
+2024.02.4      (2024-02-05)
+---------------------------
+
+**Improvements:**
+
+- Add source layers in admin list
+- Add source status and report status filter in admin
+- Add new source status, "In Progress"
+- Add author to Source, auto linked at creation
+- Add info tab to source details
 
 **Documentation:**
 

diff --git a/project/VERSION b/project/VERSION
@@ -1 +1 @@
-2024.02.3
+2024.02.4
diff --git a/project/geosource/serializers.py b/project/geosource/serializers.py
@@ -112,6 +112,7 @@ class SourceSerializer(PolymorphicModelSerializer):
     fields = FieldSerializer(many=True, required=False)
     slug = serializers.SlugField(max_length=255, read_only=True)
     report = SourceReportingSerializer(read_only=True)
+    layers = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
 
     class Meta:
         fields = "__all__"
@@ -175,6 +176,7 @@ class Meta:
             "report",
             "updated_at",
             "layers",
+            "updated_at",
         )
         extras = {"read_only": {"updated_at": True}}
 

diff --git a/requirements.txt b/requirements.txt
@@ -62,7 +62,7 @@ crispy-bootstrap5==2023.10
     # via -r requirements.in
 cron-descriptor==1.2.35
     # via django-celery-beat
-cryptography==41.0.6
+cryptography==42.0.0
     # via pyjwt
 deepmerge==1.1.0
     # via django-geostore