fix(field): default value for most fields

btry · btry · commit f05f2de3e055 · 2019-09-09T17:16:54.000+02:00
diff --git a/ajax/dropdown_values.php b/ajax/dropdown_values.php
@@ -36,13 +36,21 @@
 if (!isset($_REQUEST['dropdown_itemtype'])
     || $_REQUEST['dropdown_itemtype'] == '0'
     || !class_exists($_REQUEST['dropdown_itemtype'])) {
-   Dropdown::showFromArray('dropdown_default_value', [], ['display_emptychoice'   => true]);
+   Dropdown::showFromArray(
+      'dropdown_default_value', 
+      [], [
+         'display_emptychoice'   => true
+      ]
+   );
 } else {
+   $question = new PluginFormcreatorQuestion();
+   $question->getFromDB((int) $_REQUEST['id']);
+   $defaultValue = isset($question->fields['default_values']) 
+                   ? $question->fields['default_values']
+                   : 0;
    Dropdown::show($_REQUEST['dropdown_itemtype'], [
-      'name' => 'dropdown_default_value',
-      'rand' => mt_rand(),
+      'name'  => 'dropdown_default_value',
+      'rand'  => mt_rand(),
+      'value' => $defaultValue,
    ]);
-   $showTicketCategorySpecific = ($_REQUEST['dropdown_itemtype'] == ITILCategory::class)
-                               ? 'true'
-                               : 'false';
 }
diff --git a/inc/fields/actorfield.class.php b/inc/fields/actorfield.class.php
@@ -56,7 +56,7 @@ public function getDesignSpecializationField() {
       $additions .= '<td>';
       $additions .= '<textarea name="default_values" id="default_values" rows="4" cols="40"'
          .'style="width: 90%">'
-         .$this->getValueForDesign()
+         .$this->question->fields['default_values']
          .'</textarea>';
       $additions .= '</td>';
       $additions .= '<td>';
diff --git a/inc/fields/checkboxesfield.class.php b/inc/fields/checkboxesfield.class.php
@@ -51,7 +51,7 @@ public function getDesignSpecializationField() {
       $additions .= '<td>';
       $additions .= '<textarea name="default_values" id="default_values" rows="4" cols="40"'
          .'style="width: 90%">'
-         .$this->getValueForDesign()
+         .$this->question->fields['default_values']
          .'</textarea>';
       $additions .= '</td>';
       $additions .= '<td>';
diff --git a/inc/fields/floatfield.class.php b/inc/fields/floatfield.class.php
@@ -48,7 +48,7 @@ public function getDesignSpecializationField() {
       $additions .= '</label>';
       $additions .= '</td>';
       $additions .= '<td id="dropdown_default_value_field">';
-      $value = Html::entities_deep($this->getValueForDesign());
+      $value = Html::entities_deep($this->question->fields['default_values']);
       $additions .= '<input type="text" name="default_values" id="default_values" rows="4" cols="40"'
          .'style="width: 90%" value="'.$value.'">';
       $additions .= '</td>';
diff --git a/inc/fields/glpiselectfield.class.php b/inc/fields/glpiselectfield.class.php
@@ -93,7 +93,7 @@ public function getDesignSpecializationField() {
       $additions .= '<td></td>';
       $additions .= '<td></td>';
       $additions .= '</tr>';
-
+      $additions .= Html::scriptBlock("plugin_formcreator_changeGlpiObjectItemType($rand);");
       return [
          'label' => $label,
          'field' => $field,
diff --git a/inc/fields/hiddenfield.class.php b/inc/fields/hiddenfield.class.php
@@ -45,7 +45,7 @@ public function getDesignSpecializationField() {
       $additions .= '</label>';
       $additions .= '</td>';
       $additions .= '<td id="dropdown_default_value_field">';
-      $value = Html::entities_deep($this->getValueForDesign());
+      $value = Html::entities_deep($this->question->fields['default_values']);
       $additions .= '<input type="text" name="default_values" id="default_values" rows="4" cols="40"'
          .'style="width: 90%" value="'.$value.'">';
       $additions .= '</td>';
diff --git a/inc/fields/integerfield.class.php b/inc/fields/integerfield.class.php
@@ -48,7 +48,7 @@ public function getDesignSpecializationField() {
       $additions .= '</label>';
       $additions .= '</td>';
       $additions .= '<td id="dropdown_default_value_field">';
-      $value = Html::entities_deep($this->getValueForDesign());
+      $value = Html::entities_deep($this->question->fields['default_values']);
       $additions .= '<input type="text" name="default_values" id="default_values" rows="4" cols="40"'
          .'style="width: 90%" value="'.$value.'">';
       $additions .= '</td>';
diff --git a/inc/fields/multiselectfield.class.php b/inc/fields/multiselectfield.class.php
@@ -51,7 +51,7 @@ public function getDesignSpecializationField() {
       $additions .= '<td>';
       $additions .= '<textarea name="default_values" id="default_values" rows="4" cols="40"'
          .'style="width: 90%">'
-         .$this->getValueForDesign()
+         .$this->question->fields['default_values']
          .'</textarea>';
       $additions .= '</td>';
       $additions .= '<td>';
diff --git a/inc/fields/radiosfield.class.php b/inc/fields/radiosfield.class.php
@@ -51,7 +51,7 @@ public function getDesignSpecializationField() {
       $additions .= '<td>';
       $additions .= '<textarea name="default_values" id="default_values" rows="4" cols="40"'
          .'style="width: 90%">'
-         .$this->getValueForDesign()
+         .$this->question->fields['default_values']
          .'</textarea>';
       $additions .= '</td>';
       $additions .= '<td>';
diff --git a/inc/fields/tagfield.class.php b/inc/fields/tagfield.class.php
@@ -35,6 +35,23 @@ public function isPrerequisites() {
       return class_exists(PluginTagTag::class);
    }
 
+   public function getDesignSpecializationField() {
+      $rand = mt_rand();
+
+      $label = '';
+      $field = '';
+
+      $additions = '';
+
+      return [
+         'label' => $label,
+         'field' => $field,
+         'additions' => $additions,
+         'may_be_empty' => false,
+         'may_be_required' => true,
+      ];
+   }
+   
    public function displayField($canEdit = true) {
       global $DB;
 
diff --git a/inc/fields/textfield.class.php b/inc/fields/textfield.class.php
@@ -48,7 +48,7 @@ public function getDesignSpecializationField() {
       $additions .= '</label>';
       $additions .= '</td>';
       $additions .= '<td>';
-      $value = Html::entities_deep($this->getValueForDesign());
+      $value = Html::entities_deep($this->question->fields['default_values']);
       $additions .= '<input type="text" name="default_values" id="default_values" rows="4" cols="40"'
          .'style="width: 90%" value="'.$value.'">';
       $additions .= '</td>';
diff --git a/inc/fields/urgencyfield.class.php b/inc/fields/urgencyfield.class.php
@@ -50,7 +50,7 @@ public function getDesignSpecializationField() {
       $additions .= '<td>';
       $additions .= Ticket::dropdownUrgency([
          'name'     => 'default_values',
-         'value'    => $this->questoin->fields['default_values'],
+         'value'    => $this->question->fields['default_values'],
          'comments' => false,
          'rand'     => $rand,
          'display'  => false,
diff --git a/js/scripts.js.php b/js/scripts.js.php
@@ -776,12 +776,14 @@ function plugin_formcreator_removeNextCondition(target) {
 
 function plugin_formcreator_changeDropdownItemtype(rand) {
    dropdown_type = $('[name="form_question"] [name="dropdown_values"]').val();
+   dropdown_id   = $('[name="form_question"] [name="id"]').val();
 
    $.ajax({
       url: rootDoc + '/plugins/formcreator/ajax/dropdown_values.php',
       type: 'GET',
       data: {
          dropdown_itemtype: dropdown_type,
+         'id': dropdown_id
       },
    }).done(function(response) {
       showTicketCategorySpecific = false;
@@ -794,13 +796,15 @@ function plugin_formcreator_changeDropdownItemtype(rand) {
 }
 
 function plugin_formcreator_changeGlpiObjectItemType() {
-   glpi_object = $('[name="form_question"] [name="glpi_objects"]').val();
+   glpi_object    = $('[name="form_question"] [name="glpi_objects"]').val();
+   glpi_object_id = $('[name="form_question"] [name="id"]').val();
 
    $.ajax({
       url: rootDoc + '/plugins/formcreator/ajax/dropdown_values.php',
       type: 'GET',
       data: {
          dropdown_itemtype: glpi_object,
+         id: glpi_object_id
       },
    }).done(function(response) {
       $('#dropdown_default_value_field').html(response);
