tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

ContactQuery: Add query column `instance_name'

Browse Source 
refs #9943
This commit is contained in:
Johannes Meyer 2015-08-25 16:32:27 +02:00
parent ab628338c2
commit 7916c149b9
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
View File

@ -17,6 +17,9 @@ class ContactQuery extends IdoQuery
* {@inheritdoc} * {@inheritdoc}
*/ */
protected $columnMap = array( protected $columnMap = array(
'instances' => array(
'instance_name' => 'i.instance_name'
),
'contacts' => array( 'contacts' => array(
'contact_id' => 'c.contact_id', 'contact_id' => 'c.contact_id',
'contact' => 'co.name1 COLLATE latin1_general_ci', 'contact' => 'co.name1 COLLATE latin1_general_ci',
@ -183,6 +186,18 @@ class ContactQuery extends IdoQuery
); );
} }
/**
* Join instances
*/
protected function joinInstances()
{
$this->select->join(
array('i' => $this->prefix . 'instances'),
'i.instance_id = c.instance_id',
array()
);
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

1
modules/monitoring/library/Monitoring/DataView/Contact.php
View File

@ -11,6 +11,7 @@ class Contact extends DataView
public function getColumns() public function getColumns()
{ {
return array( return array(
'instance_name',
'contact_object_id', 'contact_object_id',
'contact_id', 'contact_id',
'contact_name', 'contact_name',