Fix missing self service ticket form defaults

glpi-project · Sep 2, 2022 · 6f6e885 · 6f6e885
1 parent 9a7113c
commit 6f6e885
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 37 deletions.
diff --git a/src/CommonITILObject.php b/src/CommonITILObject.php
@@ -352,18 +352,20 @@ public function getActorsForType(int $actortype = 1, array $params = []): array
         return $actors;
     }
 
-
     /**
-     * @param $ID
-     * @param $options   array
-     **/
-    public function showForm($ID, array $options = [])
+     * Restores input, restores saved values, then sets the default options for any that are missing.
+     * @param integer $ID The item ID
+     * @param array $options ITIL Object options array passed to showFormXXXX functions. This is passed by reference and will be modified by this function.
+     * @param ?array $overriden_defaults If specified, these values will be used as the defaults instead of the ones from the {@link getDefaultValues()} function.
+     * @param bool $force_set_defaults If true, the defaults are set for missing options even if the item is not new.
+     * @return void
+     * @see getDefaultOptions()
+     * @see restoreInput()
+     * @see restoreSavedValues()
+     */
+    protected function restoreInputAndDefaults($ID, array &$options, ?array $overriden_defaults = null, bool $force_set_defaults = false): void
     {
-        if (!static::canView()) {
-            return false;
-        }
-
-        $default_values = static::getDefaultValues();
+        $default_values = $overriden_defaults ?? static::getDefaultValues();
 
         // Restore saved value or override with page parameter
         $options['_saved'] = $this->restoreInput();
@@ -372,7 +374,7 @@ public function showForm($ID, array $options = [])
         $this->restoreSavedValues($options['_saved']);
 
         // Set default options
-        if (!$ID) {
+        if ($force_set_defaults || static::isNewID($ID)) {
             foreach ($default_values as $key => $val) {
                 if (!isset($options[$key])) {
                     if (isset($options['_saved'][$key])) {
@@ -383,6 +385,19 @@ public function showForm($ID, array $options = [])
                 }
             }
         }
+    }
+
+    /**
+     * @param $ID
+     * @param $options   array
+     **/
+    public function showForm($ID, array $options = [])
+    {
+        if (!static::canView()) {
+            return false;
+        }
+
+        $this->restoreInputAndDefaults($ID, $options);
 
         $this->initForm($ID, $options);
 
@@ -416,7 +431,7 @@ public function showForm($ID, array $options = [])
             ($ID ? $this->fields['entities_id'] : $options['entities_id'])
         );
 
-        $predefined_fields = $this->setPredefinedFields($tt, $options, $default_values);
+        $predefined_fields = $this->setPredefinedFields($tt, $options, self::getDefaultValues());
 
         TemplateRenderer::getInstance()->display('components/itilobject/layout.html.twig', [
             'item'                    => $this,

diff --git a/src/Ticket.php b/src/Ticket.php
@@ -3895,11 +3895,7 @@ public function showFormHelpdesk($ID, $ticket_template = false)
             $options['name'] = str_replace($order, $replace, $options['name']);
         }
 
-        // Restore saved value or override with page parameter
-        $options['_saved'] = $this->restoreInput();
-
-        // Restore saved values and override $this->fields
-        $this->restoreSavedValues($options['_saved']);
+        $this->restoreInputAndDefaults($ID, $options, $default_values, true);
 
        // Check category / type validity
         if ($options['itilcategories_id']) {
@@ -3949,6 +3945,7 @@ public function showFormHelpdesk($ID, $ticket_template = false)
             'selfservice'             => true,
             'item'                    => $this,
             'params'                  => $options,
+            'entities_id'             => $options['entities_id'],
             'itiltemplate_key'        => self::getTemplateFormFieldName(),
             'itiltemplate'            => $tt,
             'delegating'              => $delegating,
@@ -4139,23 +4136,7 @@ public function showForm($ID, array $options = [])
             $options['entities_id'] = $item->fields['entities_id'];
         }
 
-        $default_values = self::getDefaultValues();
-
-        // Restore saved value or override with page parameter
-        $options['_saved'] = $this->restoreInput();
-
-        // Restore saved values and override $this->fields
-        $this->restoreSavedValues($options['_saved']);
-
-        foreach ($default_values as $name => $value) {
-            if (!isset($options[$name])) {
-                if (isset($options['_saved'][$name])) {
-                    $options[$name] = $options['_saved'][$name];
-                } else {
-                    $options[$name] = $value;
-                }
-            }
-        }
+        $this->restoreInputAndDefaults($ID, $options, null, true);
 
         if (isset($options['content'])) {
             $order              = ["\\'", '\\"', "\\\\"];
@@ -4300,7 +4281,7 @@ public function showForm($ID, array $options = [])
         );
 
         // override current fields in options with template fields and return the array of these predefined fields
-        $predefined_fields = $this->setPredefinedFields($tt, $options, $default_values);
+        $predefined_fields = $this->setPredefinedFields($tt, $options, self::getDefaultValues());
 
         // check right used for this ticket
         $canupdate     = !$ID

diff --git a/templates/components/itilobject/selfservice.html.twig b/templates/components/itilobject/selfservice.html.twig
@@ -195,7 +195,7 @@
 
                      {{ include('components/itilobject/actors/main.html.twig', {
                         'item': item,
-                        'entities_id': params['entities_id'],
+                        'entities_id': entities_id,
                         'itiltemplate': itiltemplate,
                         'field_options': right_field_options,
                         'canupdate': true,
@@ -247,7 +247,7 @@
       {{ call_plugin_hook(constant('Glpi\\Plugin\\Hooks::POST_ITEM_FORM'), {'item': item, 'options': params}) }}
 
         <div class="card-footer text-center">
-            <input type="hidden" name="entities_id" value="{{ params['entities_id'] }}" />
+            <input type="hidden" name="entities_id" value="{{ entities_id }}" />
             <button type="submit" class="btn btn-primary" name="add">
                 <i class="fas fa-plus"></i>
                 <span>{{ __('Submit message') }}</span>