Add checks to json_form_widget

GetDKAN · Dec 21, 2022 · 115b220 · 115b220
1 parent 6cd2c18
commit 115b220
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/modules/json_form_widget/src/ValueHandler.php b/modules/json_form_widget/src/ValueHandler.php
@@ -132,10 +132,12 @@ public function handleArrayValues($formValues, $property, $schema) {
     if ($subschema->type === "object") {
       return $this->getObjectInArrayData($formValues, $property, $subschema);
     }
-
-    foreach ($formValues[$property][$property] as $value) {
-      $data = array_merge($data, $this->flattenArraysInArrays($value));
+    if (isset($formValues[$property][$property])) {
+      foreach ($formValues[$property][$property] as $value) {
+        $data = array_merge($data, $this->flattenArraysInArrays($value));
+      }
     }
+
     return !empty($data) ? $data : FALSE;
   }
 

diff --git a/modules/json_form_widget/src/WidgetRouter.php b/modules/json_form_widget/src/WidgetRouter.php
@@ -179,6 +179,9 @@ public function getDropdownElement($element, $spec, $titleProperty = FALSE) {
       $element = $this->handleSelectOtherDefaultValue($element, $element['#options']);
       $element['#input_type'] = isset($spec->other_type) ? $spec->other_type : 'textfield';
     }
+    if (!isset($element['#other_option'])) {
+      $element['#other_option'] = '';
+    }
     if ($element['#type'] === 'select2') {
       $element['#multiple'] = isset($spec->multiple) ? TRUE : FALSE;
       $element['#autocreate'] = isset($spec->allowCreate) ? TRUE : FALSE;