Skip to content

Commit

Permalink
Uneeded concat (on licence name) for licence inventory number and lic… (
Browse files Browse the repository at this point in the history
#3208)

* Uneeded concat (on licence name) for licence inventory number and licence serial number
+ add a default case on the switch
  • Loading branch information
AnaelMobilia authored and trasher committed Nov 28, 2017
1 parent b7f4bd9 commit e565137
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions inc/search.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -2456,7 +2456,6 @@ static function addSelect($itemtype, $ID, $num, $meta = 0, $meta_type = 0) {
AS `".$NAME."_".$num."_mailname`,
$ADDITONALFIELDS";

case "glpi_softwarelicenses.name" :
case "glpi_softwareversions.name" :
if ($meta) {
return " GROUP_CONCAT(DISTINCT CONCAT(`glpi_softwares`.`name`, ' - ',
Expand All @@ -2467,9 +2466,6 @@ static function addSelect($itemtype, $ID, $num, $meta = 0, $meta_type = 0) {
}
break;

case "glpi_softwarelicenses.serial" :
case "glpi_softwarelicenses.otherserial" :
case "glpi_softwarelicenses.comment" :
case "glpi_softwareversions.comment" :
if ($meta) {
return " GROUP_CONCAT(DISTINCT CONCAT(`glpi_softwares`.`name`, ' - ',
Expand Down Expand Up @@ -2500,6 +2496,9 @@ static function addSelect($itemtype, $ID, $num, $meta = 0, $meta_type = 0) {
$ADDITONALFIELDS";
}
break;

default:
break;
}

//// Default cases
Expand Down

0 comments on commit e565137

Please sign in to comment.