Merge branch 'master' into arslan/fix-validation-api

Author: blarghmatey

cms/djangoapps/contentstore/exams.py

@@ -74,13 +74,13 @@ def register_exams(course_key):
         # Exams in courses not using an LTI based proctoring provider should use the original definition of due_date
         # from contentstore/proctoring.py. These exams are powered by the edx-proctoring plugin and not the edx-exams
         # microservice.
+        is_instructor_paced = not course.self_paced
         if course.proctoring_provider == 'lti_external':
-            due_date = (
-                timed_exam.due.isoformat() if timed_exam.due
-                else (course.end.isoformat() if course.end else None)
-            )
+            due_date_source = timed_exam.due if is_instructor_paced else course.end
         else:
-            due_date = timed_exam.due if not course.self_paced else None
+            due_date_source = timed_exam.due if is_instructor_paced else None
+
+        due_date = due_date_source.isoformat() if due_date_source else None
 
         exams_list.append({
             'course_id': str(course_key),

cms/djangoapps/contentstore/helpers.py

@@ -529,7 +529,7 @@ def _import_xml_node_to_parent(
     node_copied_version = node.attrib.get('copied_from_version', None)
 
     # Modulestore's IdGenerator here is SplitMongoIdManager which is assigned
-    # by CachingDescriptorSystem Runtime and since we need our custom ImportIdGenerator
+    # by SplitModuleStoreRuntime and since we need our custom ImportIdGenerator
     # here we are temporaraliy swtiching it.
     original_id_generator = runtime.id_generator
 
@@ -566,7 +566,8 @@ def _import_xml_node_to_parent(
     else:
         # We have to handle the children ourselves, because there are lots of complex interactions between
         #    * the vanilla XBlock parse_xml() method, and its lack of API for "create and save a new XBlock"
-        #    * the XmlMixin version of parse_xml() which only works with ImportSystem, not modulestore or the v2 runtime
+        #    * the XmlMixin version of parse_xml() which only works with XMLImportingModuleStoreRuntime,
+        #      not modulestore or the v2 runtime
         #    * the modulestore APIs for creating and saving a new XBlock, which work but don't support XML parsing.
         # We can safely assume that if the XBLock class supports children, every child node will be the XML
         # serialization of a child block, in order. For blocks that don't support children, their XML content/nodes

cms/djangoapps/contentstore/migrations/0014_remove_componentlink_downstream_is_modified_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.2.7 on 2025-10-27 14:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentstore', '0013_componentlink_downstream_is_modified_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='componentlink',
+            name='downstream_is_modified',
+        ),
+        migrations.RemoveField(
+            model_name='containerlink',
+            name='downstream_is_modified',
+        ),
+        migrations.AddField(
+            model_name='componentlink',
+            name='downstream_customized',
+            field=models.JSONField(
+                default=list,
+                help_text=(
+                    'Names of the fields which have values set on the upstream block yet have been explicitly'
+                    ' overridden on this downstream block'
+                ),
+            ),
+        ),
+        migrations.AddField(
+            model_name='containerlink',
+            name='downstream_customized',
+            field=models.JSONField(
+                default=list,
+                help_text=(
+                    'Names of the fields which have values set on the upstream block yet have been explicitly'
+                    ' overridden on this downstream block'
+                ),
+            ),
+        ),
+    ]

cms/djangoapps/contentstore/models.py

@@ -108,7 +108,13 @@ class EntityLinkBase(models.Model):
     top_level_parent = models.ForeignKey("ContainerLink", on_delete=models.SET_NULL, null=True, blank=True)
     version_synced = models.IntegerField()
     version_declined = models.IntegerField(null=True, blank=True)
-    downstream_is_modified = models.BooleanField(default=False)
+    downstream_customized = models.JSONField(
+        default=list,
+        help_text=(
+            'Names of the fields which have values set on the upstream block yet have been explicitly'
+            ' overridden on this downstream block'
+        ),
+    )
     created = manual_date_time_field()
     updated = manual_date_time_field()
 
@@ -258,7 +264,7 @@ def update_or_create(
         version_synced: int,
         top_level_parent_usage_key: UsageKey | None = None,
         version_declined: int | None = None,
-        downstream_is_modified: bool = False,
+        downstream_customized: list[str] | None = None,
         created: datetime | None = None,
     ) -> "ComponentLink":
         """
@@ -283,7 +289,7 @@ def update_or_create(
             'version_synced': version_synced,
             'version_declined': version_declined,
             'top_level_parent': top_level_parent,
-            'downstream_is_modified': downstream_is_modified,
+            'downstream_customized': downstream_customized,
         }
         if upstream_block:
             new_values['upstream_block'] = upstream_block
@@ -485,7 +491,7 @@ def update_or_create(
         version_synced: int,
         top_level_parent_usage_key: UsageKey | None = None,
         version_declined: int | None = None,
-        downstream_is_modified: bool = False,
+        downstream_customized: list[str] | None = None,
         created: datetime | None = None,
     ) -> "ContainerLink":
         """
@@ -510,7 +516,7 @@ def update_or_create(
             'version_synced': version_synced,
             'version_declined': version_declined,
             'top_level_parent': top_level_parent,
-            'downstream_is_modified': downstream_is_modified,
+            'downstream_customized': downstream_customized,
         }
         if upstream_container_id:
             new_values['upstream_container_id'] = upstream_container_id

cms/djangoapps/contentstore/rest_api/v1/serializers/vertical_block.py

@@ -124,7 +124,7 @@ class UpstreamLinkSerializer(serializers.Serializer):
     version_declined = serializers.IntegerField(allow_null=True)
     error_message = serializers.CharField(allow_null=True)
     ready_to_sync = serializers.BooleanField()
-    is_modified = serializers.BooleanField()
+    downstream_customized = serializers.ListField(child=serializers.CharField(), allow_empty=True)
     has_top_level_parent = serializers.BooleanField()
     ready_to_sync_children = UpstreamChildrenInfoSerializer(many=True, required=False)
 
@@ -185,7 +185,7 @@ class UpstreamReadyToSyncChildrenInfoSerializer(serializers.Serializer):
         name = serializers.CharField()
         upstream = serializers.CharField()
         block_type = serializers.CharField()
-        is_modified = serializers.BooleanField()
+        downstream_customized = serializers.ListField(child=serializers.CharField(), allow_empty=True)
 
     children = ContainerChildSerializer(many=True)
     is_published = serializers.BooleanField()

cms/djangoapps/contentstore/rest_api/v1/views/course_index.py

@@ -242,7 +242,7 @@ def get(self, request: Request, usage_key_string: str):
                 "name": "Text",
                 "upstream": "lb:org:mylib:html:abcd",
                 'block_type': "html",
-                'is_modified': true,
+                'downstream_customized': ["display_name"],
                 'id': "block-v1:org+101+101+type@html+block@3e3fa1f88adb4a108cd14e9002143690",
             }]
         }

cms/djangoapps/contentstore/rest_api/v1/views/tests/test_vertical_block.py

@@ -248,7 +248,7 @@ def test_success_response_with_upstream_info(self):
             "id": str(self.html_unit_second.usage_key),
             "upstream": self.html_block["id"],
             "block_type": "html",
-            "is_modified": False,
+            "downstream_customized": [],
             "name": "Html Content 2",
         }])
 
@@ -324,7 +324,7 @@ def test_children_content(self):
                     "error_message": None,
                     "ready_to_sync": True,
                     "has_top_level_parent": False,
-                    "is_modified": False,
+                    "downstream_customized": [],
                 },
                 "user_partition_info": expected_user_partition_info,
                 "user_partitions": expected_user_partitions,