Skip to content

Commit

Permalink
Fix network ports display; fixes glpi-project#5460 glpi-project#5461
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Feb 24, 2019
1 parent abade53 commit e785fda
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions inc/networkportinstantiation.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,17 +278,21 @@ function getInstantiationHTMLTable(NetworkPort $netport, HTMLTableRow $row,
$virtual_header = $row->getHeaderByName('Instantiation', 'VirtualPorts');

$iterator = $DB->request([
'FROM' => new \QueryUnion([
'FROM' => new \QueryUnion(
[
'SELECT' => 'networkports_id',
'FROM' => 'glpi_networkportaliases',
'WHERE' => ['networkports_id_alias' => $netport->getID()]
], [
'SELECT' => 'networkports_id',
'FROM' => 'glpi_networkportaggregates',
'WHERE' => ['networkports_id_list' => ['LIKE', '%"'.$netport-getID().'"%']]
]
])
[
'SELECT' => 'networkports_id',
'FROM' => 'glpi_networkportaliases',
'WHERE' => ['networkports_id_alias' => $netport->getID()]
], [
'SELECT' => 'networkports_id',
'FROM' => 'glpi_networkportaggregates',
'WHERE' => ['networkports_id_list' => ['LIKE', '%"'.$netport->getID().'"%']]
]
],
false,
'networkports'
)
]);

if (count($iterator)) {
Expand Down

0 comments on commit e785fda

Please sign in to comment.