feat(core): add options to display ITIL Category question

pluginsGLPI · Oct 29, 2018 · f20acbf · f20acbf
1 parent d7b6dc8
commit f20acbf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -77,6 +77,15 @@ public function displayField($canEdit = true) {
                      case 'incident':
                         $dparams['condition'] .= " AND `is_incident` = '1'";
                         break;
+                     case 'both':
+                        $dparams['condition'] .= " AND `is_incident` = '1' OR `is_request` = '1' ";
+                        break;
+                     case 'change':
+                        $dparams['condition'] .= " AND `is_change` = '1'";
+                        break;
+                     case 'all':
+                        $dparams['condition'] .= " AND `is_change` = '1' OR `is_incident` = '1' OR  `is_request` = '1'";
+                        break;
                   }
                   if (isset($decodedValues['show_ticket_categories_depth'])
                      && $decodedValues['show_ticket_categories_depth'] > 0) {

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -934,9 +934,11 @@ function plugin_formcreator_hideAllParameters() {
       echo '</td>';
       echo '<td>';
       $ticketCategoriesOptions = [
-         'request'   => __('Request categories', 'formcreator'),
-         'incident'  => __('Incident categories', 'formcreator'),
-         'both'      => __('Both', 'formcreator'),
+         'request'  => __('Request categories', 'formcreator'),
+         'incident' => __('Incident categories', 'formcreator'),
+         'both'     => __('Request categories', 'formcreator'). " + ".__('Incident categories', 'formcreator'),
+         'change'   => __('Change'),
+         'all'      => __('All'),
       ];
       dropdown::showFromArray('show_ticket_categories', $ticketCategoriesOptions, [
          'rand'  => $rand,