...

bayer/templates/modals/collections/new_package_modal.html

@@ -5,11 +5,11 @@
   class="modal"
   x-data="{
     isSubmitting: false,
-    packageClassification: null,
+    packageClassification: '',
 
     reset() {
       this.isSubmitting = false;
-      this.packageClassification = null;
+      this.packageClassification = '';
     },
 
     setFormData(data) {
@@ -114,7 +114,7 @@
             x-model="packageClassification"
             required
           >
-            <option value="null" disabled selected>Select Classification</option>
+            <option value="" disabled>Select Classification</option>
             <option value="0">Internal</option>
             <option value="10">Restricted</option>
             <option value="20">Secret</option>

epapi/v1/interfaces/iuclid/projections.py

@@ -56,7 +56,7 @@ def get_pathway_for_iuclid_export(user, pathway_uuid: UUID) -> PathwayExportDTO:
 
         ai_for_node = []
         scenario_entries: list[PathwayScenarioDTO] = []
-        for scenario in sorted(node.scenarios.all(), key=lambda item: item.pk):
+        for scenario in sorted(node.get_scenarios(), key=lambda item: item.pk):
             ai_for_scenario = list(scenario.get_additional_information(direct_only=True))
             ai_for_node.extend(ai_for_scenario)
             scenario_entries.append(

epiuclid/serializers/pathway_mapper.py

@@ -351,7 +351,8 @@ class PathwayMapper:
 
         props = SoilPropertiesData()
 
-        for ai in ai_list:
+        for ai_obj in ai_list:
+            ai = ai_obj.get()
             if isinstance(ai, SoilTexture1) and props.soil_type is None:
                 props.soil_type = ai.type.value
             elif isinstance(ai, SoilTexture2):