From 10ee7792b5b939f1f3bdf2c2ef68f1036b6f3244 Mon Sep 17 00:00:00 2001
From: Paulo Viadanna <paulo@opencraft.com>
Date: Wed, 2 Apr 2025 14:52:33 -0300
Subject: [PATCH] fix: prevent null release date field in xblocks

---
 .../contentstore/xblock_storage_handlers/view_handlers.py    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
index 2be43c7911de..e2f9d8334a37 100644
--- a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
+++ b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
@@ -424,6 +424,11 @@ def _save_xblock(
                 for metadata_key, value in metadata.items():
                     field = xblock.fields[metadata_key]
 
+                    # Prevent setting release date to null
+                    # remove field and inherit from parent instead
+                    if metadata_key == "start" and value == "":
+                        value = None
+
                     if value is None:
                         field.delete_from(xblock)
                     else: