admin improvements 3 (#1830)

pyproject.toml

@@ -61,6 +61,7 @@ whitenoise = "^6.7.0"
 djangorestframework-types = "^0.8.0"
 toml = "^0.10.2"
 rio-cogeo = "^5.3.6"
+django-json-widget = "^2.0.1"
 
 [tool.poetry.group.dev.dependencies]
 colorama = "^0.4.6"

src/planscape/datasets/admin.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict
 from django.contrib import admin
-from datasets.forms import DatasetAdminForm, CategoryAdminForm
+from datasets.forms import DataLayerAdminForm, DatasetAdminForm, CategoryAdminForm
 from datasets.models import Category, DataLayer, Dataset
 from treebeard.admin import TreeAdmin
 from treebeard.forms import movenodeform_factory
@@ -31,6 +31,7 @@ def get_changeform_initial_data(self, request) -> Dict[str, Any]:
 
 
 class DataLayerAdmin(admin.ModelAdmin):
+    form = DataLayerAdminForm
     search_fields = [
         "organization__name__icontains",
         "dataset__name__icontains",

src/planscape/datasets/forms.py

@@ -1,7 +1,8 @@
 from django import forms
 
-from datasets.models import Category, Dataset
+from datasets.models import Category, DataLayer, Dataset
 from treebeard.forms import movenodeform_factory
+from django_json_widget.widgets import JSONEditorWidget
 
 
 class DatasetAdminForm(forms.ModelForm):
@@ -40,3 +41,33 @@ class Meta:
             "name",
             "order",
         )
+
+
+class DataLayerAdminForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["created_by"].disabled = True
+        self.fields["original_name"].disabled = True
+        self.fields["mimetype"].disabled = True
+        self.fields["url"].disabled = True
+        self.fields["geometry"].disabled = True
+
+    class Meta:
+        model = DataLayer
+        widgets = {
+            "info": JSONEditorWidget,
+            "metadata": JSONEditorWidget,
+        }
+        fields = (
+            "organization",
+            "created_by",
+            "dataset",
+            "category",
+            "name",
+            "info",
+            "metadata",
+            "original_name",
+            "mimetype",
+            "url",
+            "geometry",
+        )

src/planscape/datasets/models.py

@@ -216,5 +216,6 @@ def __str__(self) -> str:
         return f"{self.name} [{self.type}]"
 
     class Meta(TypedModelMeta):
+        ordering = ("organization", "dataset", "id")
         verbose_name = "Datalayer"
         verbose_name_plural = "Datalayers"

src/planscape/organizations/models.py

@@ -45,6 +45,7 @@ def __str__(self):
         return f"{self.name} [{self.type}]"
 
     class Meta(TypedModelMeta):
+        ordering = ("id",)
         verbose_name = "Organization"
         verbose_name_plural = "Organizations"
         constraints = [

src/planscape/planscape/settings.py

@@ -68,6 +68,7 @@
     "django.contrib.staticfiles",
     "django.contrib.gis",
     "django_extensions",
+    "django_json_widget",
     "actstream",
     "password_policies",
     "rest_framework",