remove name and service field from dataseturi: info already in the URL

Author: aperrin66

docs/source/geospaas/catalog.rst

@@ -13,14 +13,6 @@ Subpackages
 Submodules
 ==========
 
-geospaas.catalog.managers
--------------------------
-
-.. automodule:: geospaas.catalog.managers
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 geospaas.catalog.models
 -----------------------
 

geospaas/base_viewer/templates/base_viewer/ds_info.html

@@ -5,7 +5,7 @@
     {% endblock ds_detailed_info %}
     {% for url in ds.dataseturi_set.all %}
     <div class="attr_title">Address:</div>
-    {% if show_local_address or url.service != local_file_service %}
+    {% if show_local_address %}
     <div class="attr_content">{{ url.uri|escape|urlize}} </div>
     {% else %}
     <div class="attr_content">hidden local address of dataset</div>

geospaas/base_viewer/views.py

@@ -7,7 +7,6 @@
 
 from geospaas.base_viewer.forms import BaseSearchForm
 from geospaas.catalog.models import Dataset
-from geospaas.catalog.managers import LOCAL_FILE_SERVICE
 
 # def get_geometry_geojson(request, pk, *args, **kwargs):
 #     """ Get GeographicLocation.Geometry as GeoJSON

geospaas/catalog/managers.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.25 on 2025-05-15 14:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalog', '0014_auto_20250513_1302'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dataseturi',
+            name='name',
+        ),
+        migrations.RemoveField(
+            model_name='dataseturi',
+            name='service',
+        ),
+    ]

geospaas/catalog/migrations/0015_auto_20250515_1401.py

@@ -11,10 +11,6 @@
 from geospaas.vocabularies.models import Parameter
 from geospaas.vocabularies.models import Keyword
 
-from geospaas.catalog.managers import DatasetURIManager
-from geospaas.catalog.managers import FILE_SERVICE_NAME
-from geospaas.catalog.managers import LOCAL_FILE_SERVICE
-
 
 class Personnel(models.Model):
     '''
@@ -122,14 +118,10 @@ def __str__(self):
         return self.entry_id
 
 class DatasetURI(models.Model):
-
-    name = models.CharField(max_length=20, default=FILE_SERVICE_NAME)
-    service = models.CharField(max_length=20, default=LOCAL_FILE_SERVICE)
     uri = models.URLField(max_length=500,
             validators=[URLValidator(schemes=URLValidator.schemes + ['file'])])
     dataset = models.ForeignKey(Dataset, on_delete=models.CASCADE)
 
-    objects = DatasetURIManager()
     class Meta:
         constraints = [
             models.UniqueConstraint(name='unique_dataset_uri', fields=['uri', 'dataset'])