Skip to content

Commit 0754b5f

Browse files
committed
fix(issue): php warnings in service catalog
also fixes compatibility with GLPI 9.3 and 9.4 Signed-off-by: btry <tbugier@teclib.com>
1 parent 319bb46 commit 0754b5f

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

inc/form_answer.class.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,7 @@ public static function getSpecificValueToDisplay($field, $values, array $options
269269
switch ($field) {
270270
case 'status' :
271271
$output = '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/' . $values[$field] . '.png"
272-
alt="' . __($values[$field], 'formcreator') . '" title="' . __($values[$field], 'formcreator') . '" /> '
273-
. __($values[$field], 'formcreator');
272+
alt="' . __($values[$field], 'formcreator') . '" title="' . __($values[$field], 'formcreator') . '" /> ';
274273
return $output;
275274
break;
276275
}

inc/issue.class.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,16 @@ public function getTicketsForDisplay($options) {
277277
return $item;
278278
}
279279

280-
/**
280+
/**
281281
* Define search options for forms
282282
*
283283
* @return Array Array of fields to show in search engine and options for each fields
284284
*/
285285
public function getSearchOptionsNew() {
286+
return $this->rawSearchOptions();
287+
}
288+
289+
public function rawSearchOptions() {
286290
$tab = [];
287291

288292
$tab[] = [
@@ -493,8 +497,11 @@ public static function giveItem($itemtype, $option_id, $data, $num) {
493497
switch ($data['raw']['sub_itemtype']) {
494498
case 'Ticket':
495499
$status = Ticket::getStatus($data['raw']["ITEM_$num"]);
496-
return "<img src='".Ticket::getStatusIconURL($data['raw']["ITEM_$num"])."'
497-
alt=\"$status\" title=\"$status\">&nbsp;$status";
500+
if (version_compare(PluginFormcreatorCommon::getGlpiVersion(), '9.3') < 0) {
501+
return "<img src='".Ticket::getStatusIconUrl($data['raw']["ITEM_$num"])."'
502+
alt=\"$status\" title=\"$status\">&nbsp;$status";
503+
}
504+
return Ticket::getStatusIcon($data['raw']["ITEM_$num"]);
498505
break;
499506

500507
case 'PluginFormcreatorForm_Answer':

0 commit comments

Comments
 (0)