Merge branch 'feat/blobs' into time-blobs

# Conflicts: # ietf/doc/storage_backends.py
ietf-tools · Feb 14, 2025 · bd88352 · bd88352
2 parents 9000978 + 177018e
commit bd88352
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/ietf/doc/migrations/0025_storedobject_storedobject_unique_name_per_store.py b/ietf/doc/migrations/0025_storedobject_storedobject_unique_name_per_store.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.18 on 2025-02-04 20:51
+# Copyright The IETF Trust 2025, All Rights Reserved
 
 from django.db import migrations, models
 

diff --git a/ietf/doc/storage_backends.py b/ietf/doc/storage_backends.py
@@ -116,6 +116,7 @@ def store_file(
                     record.sha384 = self.in_flight_custom_metadata[name]["sha384"]
                     record.len = int(self.in_flight_custom_metadata[name]["len"])
                     record.modified = now
+                    record.deleted = None
                     record.save()
                 if new_name != name:
                     complaint = f"Error encountered saving '{name}' - results stored in '{new_name}' instead."

diff --git a/ietf/meeting/migrations/0010_alter_floorplan_image_alter_meetinghost_logo.py b/ietf/meeting/migrations/0010_alter_floorplan_image_alter_meetinghost_logo.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.18 on 2025-01-29 14:49
+# Copyright The IETF Trust 2025, All Rights Reserved
 
 from django.db import migrations, models
 import ietf.meeting.models

diff --git a/ietf/person/migrations/0004_alter_person_photo_alter_person_photo_thumb.py b/ietf/person/migrations/0004_alter_person_photo_alter_person_photo_thumb.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.18 on 2025-01-29 14:49
+# Copyright The IETF Trust 2025, All Rights Reserved
 
 from django.db import migrations, models
 import ietf.utils.storage