Skip to content

Commit 3a5484a

Browse files
committed
fix SeachOption displayed names
1 parent 28d67f6 commit 3a5484a

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

src/Ticket.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2680,19 +2680,20 @@ public function rawSearchOptions()
26802680
'id' => '190',
26812681
'table' => 'glpi_olas',
26822682
'field' => 'name',
2683-
'name' => __('time to own') . ' - ' . __('name'),
2683+
'name' => __('OLA') . ' ' . __('time to own'),
26842684
'massiveaction' => false,
26852685
'datatype' => 'dropdown',
26862686
'joinparams' => [
26872687
'condition' => ['NEWTABLE.type' => SLM::TTO],
26882688
'beforejoin' => [
2689-
'table' => 'glpi_items_olas',
2689+
'table' => 'glpi_items_olas', // @todoseb getTable()
26902690
'joinparams' => [
26912691
'jointype' => 'itemtype_item',
26922692
],
26932693
],
26942694
],
26952695
'forcegroupby' => true,
2696+
'condition' => ['type' => SLM::TTO], // @todoseb n'est pas documenté : sert pour le dropdown dans le filtrage
26962697
];
26972698

26982699
// OLA TTO due time (+ Progress)
@@ -2701,7 +2702,7 @@ public function rawSearchOptions()
27012702
'id' => '186',
27022703
'table' => 'glpi_items_olas',
27032704
'field' => 'due_time',
2704-
'name' => __('time to own') . ' - ' . __('due time + progress'),
2705+
'name' => __('OLA') . ' ' . __('time to own') . ' - ' . __('due time + progress'),
27052706
'massiveaction' => false,
27062707
'nosearch' => true,
27072708
'additionalfields' => ['TABLE.status', 'TABLE.takeintoaccount_delay_stat', 'TABLE.date', 'olas_id', 'waiting_time', 'end_time'],
@@ -2732,7 +2733,7 @@ public function rawSearchOptions()
27322733
'id' => '187',
27332734
'table' => 'glpi_items_olas',
27342735
'field' => 'is_late',
2735-
'name' => __('Internal time to own exceeded'),
2736+
'name' => __('OLA') . ' ' . __('Internal time to own exceeded'),
27362737
'datatype' => 'bool',
27372738
'massiveaction' => false,
27382739
'computation' => self::generateSLAOLAComputation('internal_time_to_own', 'glpi_items_olas'),
@@ -2764,7 +2765,7 @@ public function rawSearchOptions()
27642765
'id' => '191',
27652766
'table' => 'glpi_olas',
27662767
'field' => 'name',
2767-
'name' => __('Internal time to resolve') . ' - ' . __('name'),
2768+
'name' => __('OLA') . ' ' . __('Internal time to resolve'),
27682769
'massiveaction' => false,
27692770
'datatype' => 'dropdown',
27702771
'joinparams' => [
@@ -2777,6 +2778,7 @@ public function rawSearchOptions()
27772778
],
27782779
],
27792780
'forcegroupby' => true,
2781+
'condition' => ['type' => SLM::TTR],
27802782
];
27812783

27822784
// OLA TTR due time (+ Progress)
@@ -2785,7 +2787,7 @@ public function rawSearchOptions()
27852787
'table' => 'glpi_items_olas',
27862788
'field' => 'due_time',
27872789
'datatype' => 'datetime',
2788-
'name' => __('Internal time to resolve') . ' - ' . __('due time + progress'),
2790+
'name' => __('OLA') . ' ' . __('Internal time to resolve') . ' - ' . __('due time + progress'),
27892791
'massiveaction' => false,
27902792
'nosearch' => true,
27912793
'additionalfields' => ['TABLE.status', 'TABLE.takeintoaccount_delay_stat', 'TABLE.date', 'olas_id', 'waiting_time', 'end_time'],
@@ -2816,7 +2818,7 @@ public function rawSearchOptions()
28162818
'id' => '182',
28172819
'table' => 'glpi_items_olas',
28182820
'field' => 'is_late',
2819-
'name' => __('Internal time to resolve exceeded'),
2821+
'name' => __('OLA') . ' ' . __('Internal time to resolve exceeded'),
28202822
'datatype' => 'bool',
28212823
'massiveaction' => false,
28222824
'computation' => self::generateSLAOLAComputation('internal_time_to_resolve', 'glpi_items_olas'),
@@ -2849,7 +2851,7 @@ public function rawSearchOptions()
28492851
'id' => '192',
28502852
'table' => 'glpi_olalevels',
28512853
'field' => 'name',
2852-
'name' => _n('Escalation level', 'Escalation levels', 1),
2854+
'name' => __('OLA') . ' ' . _n('Escalation level', 'Escalation levels', 1),
28532855
'massiveaction' => false,
28542856
'datatype' => 'dropdown',
28552857
'joinparams' => [

0 commit comments

Comments
 (0)