Merge pull request #89 from octue/label-styling

FIX: Rename unfold templates to use unfold's field rendering

Author: thclark

django_gcp/storage/admin.py

@@ -16,7 +16,7 @@ def get_readonly_blob_widget(self, obj, field_name):
             "download_url": get_signed_download_url(obj, field_name),
             "console_url": get_console_url(obj, field_name),
         }
-        return mark_safe(render_to_string("django_gcp/contrib/unfold/cloud_object_readonly_widget.html", context))
+        return mark_safe(render_to_string("unfold/contrib/django_gcp/cloud_object_readonly_widget.html", context))
 
     def _replace_blob_field_names(self, fields, fields_to_replace):
         blob_fields = set(f.name for f in self.model._meta.get_fields() if isinstance(f, BlobField))

django_gcp/storage/blob_utils.py

@@ -111,3 +111,6 @@ def get_signed_url(self, field_name, expiration=None):
     def get_signed_download_url(self, field_name, expiration=None):
         """Get a signed URL to the blob with the response disposition set"""
         return get_signed_download_url(self, field_name, expiration)
+
+    # def override_path(self, field_name, path):
+    #     """Set a blobfield path manually, avoiding any quality control, checks or ingress"""

django_gcp/storage/widgets.py

@@ -44,7 +44,7 @@ def __init__(
         self.ingress_path = ingress_path
 
         if "unfold" in settings.INSTALLED_APPS:
-            self.template_name = "django_gcp/contrib/unfold/cloud_object_widget.html"
+            self.template_name = "unfold/contrib/django_gcp/cloud_object_widget.html"
 
     def get_context(self, name, value, attrs):
         context = super().get_context(name, value, attrs)

django_gcp/templates/django_gcp/contrib/unfold/cloud_object_readonly_widget.html renamed to django_gcp/templates/unfold/contrib/django_gcp/cloud_object_readonly_widget.html

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-gcp"
-version = "0.18.3"
+version = "0.18.4"
 description = "Utilities to run Django on Google Cloud Platform"
 authors = ["Tom Clark"]
 license = "MIT"