fix(fieldsfield): required property update on UI

btry · btry · commit f8f645119832 · 2024-06-07T09:34:16.000+02:00
diff --git a/ajax/question_design.php b/ajax/question_design.php
@@ -69,5 +69,7 @@
 $question->fields['fieldtype'] = '';
 if ($field !== null) {
    $question->fields['fieldtype'] = $_REQUEST['fieldtype'];
+   $question->fields['_blocks_field'] = $_REQUEST['blocks_field'];
+   $question->fields['_dropdown_fields_field'] = $_REQUEST['dropdown_fields_field'];
 }
 $question->showForm($question->getID());
diff --git a/inc/field/fieldsfield.class.php b/inc/field/fieldsfield.class.php
@@ -63,7 +63,7 @@ class FieldsField extends PluginFormcreatorAbstractField
    public function getField(): ?PluginFieldsField {
       if ($this->field === null && isset($this->question->fields['values'])) {
          $decodedValues = json_decode($this->question->fields['values'], JSON_OBJECT_AS_ARRAY);
-         $field_name = $decodedValues['dropdown_fields_field'] ?? '';
+         $field_name = $decodedValues['dropdown_fields_field'] ?? ($this->question->fields['_field_name'] ?? '');
          $fieldObj = new PluginFieldsField();
          if ($fieldObj->getFromDBByCrit(['name' => $field_name])) {
             $this->field = $fieldObj;
diff --git a/templates/field/fieldsfield.html.twig b/templates/field/fieldsfield.html.twig
@@ -59,6 +59,7 @@
          item.fields['_field_list'],
          item.fields['_drodpdown_field_label'],
          {
+            on_change: 'plugin_formcreator.changeQuestionType(this)',
             display_emptychoice: true,
             label_class: 'col-xxl-4',
             input_class: 'col-xxl-8',

Original file line number	Diff line number	Diff line change
`@@ -69,5 +69,7 @@`
`69`	`69`	`$question->fields['fieldtype'] = '';`
`70`	`70`	`if ($field !== null) {`
`71`	`71`	`$question->fields['fieldtype'] = $_REQUEST['fieldtype'];`
	`72`	`+ $question->fields['_blocks_field'] = $_REQUEST['blocks_field'];`
	`73`	`+ $question->fields['_dropdown_fields_field'] = $_REQUEST['dropdown_fields_field'];`
`72`	`74`	`}`
`73`	`75`	`$question->showForm($question->getID());`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@`
`59`	`59`	`item.fields['_field_list'],`
`60`	`60`	`item.fields['_drodpdown_field_label'],`
`61`	`61`	`{`
	`62`	`+ on_change: 'plugin_formcreator.changeQuestionType(this)',`
`62`	`63`	`display_emptychoice: true,`
`63`	`64`	`label_class: 'col-xxl-4',`
`64`	`65`	`input_class: 'col-xxl-8',`