Merge branch 'main-ui' of github.com:zalf-rdm/geonode into main-ui

Author: mwallschlaeger

.github/workflows/backport.yml

@@ -19,7 +19,7 @@
 
 import os
 
-__version__ = (4, 4, 3, 'final', 0)
+__version__ = (4, 4, 3, "final", 0)
 
 
 def get_version():

.github/workflows/codeql.yml

@@ -12,7 +12,6 @@
 
 
 class PrettyJSONWidget(widgets.Textarea):
-
     def format_value(self, value):
         try:
             value = json.dumps(json.loads(value), indent=2, sort_keys=True)

geonode/__init__.py

@@ -10,13 +10,11 @@
 
 
 class AssetDownloadHandlerInterface:
-
     def create_response(self, asset: Asset, attachment: bool = False, basename=None, path=None) -> HttpResponse:
         raise NotImplementedError()
 
 
 class AssetHandlerInterface:
-
     def handled_asset_class(self):
         raise NotImplementedError()
 

geonode/assets/admin.py

@@ -35,7 +35,6 @@ def get_link_url(self, asset: LocalAsset):
 
 
 class LocalAssetHandler(AssetHandlerInterface):
-
     link_url_handlers = {"3dtiles": IndexLocalLinkUrlHandler()}
 
     @staticmethod
@@ -219,7 +218,6 @@ def __force_real_instance(cls, asset):
 
 
 class LocalAssetDownloadHandler(AssetDownloadHandlerInterface):
-
     def create_response(
         self, asset: LocalAsset, attachment: bool = False, basename: str = None, path: str = None
     ) -> HttpResponse:

geonode/assets/handlers.py

@@ -32,7 +32,6 @@
 
 
 class ClassTypeField(DynamicComputedField):
-
     def get_attribute(self, instance):
         return type(instance).__name__
 
@@ -59,7 +58,6 @@ def get_attribute(self, instance):
 
 
 class AssetSerializer(DynamicModelSerializer):
-
     owner = SimpleUserSerializer(embed=False)
     asset_type = ClassTypeField()
     subinfo = AssetSubclassField()

geonode/assets/local.py

@@ -42,7 +42,6 @@
 
 
 class AssetsTests(APITestCase):
-
     def test_handler_registry(self):
         # Test registry
         self.assertIsNotNone(asset_handler_registry)
@@ -215,7 +214,6 @@ def test_clone_mixed_data(self):
 
 
 class AssetsDownloadTests(APITestCase):
-
     fixtures = ["initial_data.json", "group_test_data.json", "default_oauth_apps.json"]
 
     def _get_streaming_content(self, response):

geonode/assets/serializers.py

@@ -96,7 +96,6 @@ def create_asset_and_link(
     mime=None,
     clone_files: bool = True,
 ) -> tuple[Asset, Link]:
-
     asset_handler = handler or asset_handler_registry.get_default_handler()
     asset = link = None
     try:

geonode/assets/tests.py

@@ -180,8 +180,8 @@ def has_delete_permission(self, request, obj=None):
 class ContactRoleAdmin(admin.ModelAdmin):
     model = ContactRole
     list_display_links = ("id",)
-    list_display = ("id", "contact", "resource", "role")
-    list_editable = ("contact", "resource", "role")
+    list_display = ("id", "contact", "resource", "role", "order")
+    list_editable = ("contact", "resource", "role", "order")
     form = forms.modelform_factory(ContactRole, fields="__all__")