tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ActivityLog: preserve object when switching tab

This commit is contained in:
Thomas Gelf 2017-07-25 14:20:39 +02:00
parent f44afef214
commit c0e723c57e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/ShowController.php
View File

@ -24,7 +24,7 @@ class ShowController extends ActionController
$info->setChecksum($p->get('checksum')) $info->setChecksum($p->get('checksum'))
->setId($p->get('id')); ->setId($p->get('id'));
$this->tabs($info->getTabs()); $this->tabs($info->getTabs($this->url()));
$info->showTab($this->params->get('show')); $info->showTab($this->params->get('show'));
$this->addTitle($info->getTitle()); $this->addTitle($info->getTitle());

5
library/Director/Web/Table/ActivityLogTable.php
View File

@ -17,6 +17,8 @@ class ActivityLogTable extends ZfQueryBasedTable
protected $columnCount; protected $columnCount;
protected $hasObjectFilter = false;
/** @var BaseElement */ /** @var BaseElement */
protected $currentHead; protected $currentHead;
@ -68,7 +70,7 @@ class ActivityLogTable extends ZfQueryBasedTable
} }
// multi column key :( // multi column key :(
if ($type === 'service') { if ($type === 'service' || $this->hasObjectFilter) {
$object = "\"$name\""; $object = "\"$name\"";
} else { } else {
$object = Link::create( $object = Link::create(
@ -97,6 +99,7 @@ class ActivityLogTable extends ZfQueryBasedTable
public function filterObject($type, $name) public function filterObject($type, $name)
{ {
$this->hasObjectFilter = true;
$this->filters[] = ['l.object_type = ?', $type]; $this->filters[] = ['l.object_type = ?', $type];
$this->filters[] = ['l.object_name = ?', $name]; $this->filters[] = ['l.object_name = ?', $name];
$this->extraParams = [ $this->extraParams = [