fix(urgencyfield): default value

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Dec 13, 2018 · 1849e61 · 1849e61
1 parent 167c43f
commit 1849e61
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/inc/fields/urgencyfield.class.php b/inc/fields/urgencyfield.class.php
@@ -63,6 +63,9 @@ public static function getName() {
    }
 
    public function prepareQuestionInputForSave($input) {
+      $this->value = $input['default_values'] != ''
+                     ? (int) $input['default_values']
+                     : '3';
       return $input;
    }
 
@@ -103,7 +106,7 @@ public function getAvailableValues() {
 
    public function serializeValue() {
       if ($this->value === null || $this->value === '') {
-         return '';
+         return '3';
       }
 
       return $this->value;
@@ -112,7 +115,7 @@ public function serializeValue() {
    public function deserializeValue($value) {
       $this->value = ($value !== null && $value !== '')
                   ? $value
-                  : '';
+                  : '3';
    }
 
    public function getValueForDesign() {

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -264,8 +264,8 @@ public static function showForForm(CommonDBTM $item, $withtemplate = '') {
 
    /**
     * Validate form fields before add or update a question
-    * @param  Array $input Datas used to add the item
-    * @return Array        The modified $input array
+    * @param  array $input Datas used to add the item
+    * @return array        The modified $input array
     */
    private function checkBeforeSave($input) {
       // Control fields values :

diff --git a/tests/suite-integration/PluginFormcreatorTargetTicket.php b/tests/suite-integration/PluginFormcreatorTargetTicket.php
@@ -124,6 +124,7 @@ public function testUrgency() {
                [
                   'name'                  => 'custom urgency',
                   'fieldtype'             => 'urgency',
+                  'default_values'        => '3',
                ],
             ],
          ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,6 +124,7 @@ public function testUrgency() { @@
                    [
                       'name'                  => 'custom urgency',
                       'fieldtype'             => 'urgency',
+                      'default_values'        => '3',
                    ],
                 ],
              ],
@@ Expand Down @@