From c0e723c57e6acab91e45665de380d22ac869a312 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 25 Jul 2017 14:20:39 +0200
Subject: [PATCH] ActivityLog: preserve object when switching tab

---
 application/controllers/ShowController.php      | 2 +-
 library/Director/Web/Table/ActivityLogTable.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php
index fbee4c8e..ed612ab8 100644
--- a/application/controllers/ShowController.php
+++ b/application/controllers/ShowController.php
@@ -24,7 +24,7 @@ class ShowController extends ActionController
         $info->setChecksum($p->get('checksum'))
              ->setId($p->get('id'));
 
-        $this->tabs($info->getTabs());
+        $this->tabs($info->getTabs($this->url()));
         $info->showTab($this->params->get('show'));
 
         $this->addTitle($info->getTitle());
diff --git a/library/Director/Web/Table/ActivityLogTable.php b/library/Director/Web/Table/ActivityLogTable.php
index 802b37a0..dd37e057 100644
--- a/library/Director/Web/Table/ActivityLogTable.php
+++ b/library/Director/Web/Table/ActivityLogTable.php
@@ -17,6 +17,8 @@ class ActivityLogTable extends ZfQueryBasedTable
 
     protected $columnCount;
 
+    protected $hasObjectFilter = false;
+
     /** @var BaseElement */
     protected $currentHead;
 
@@ -68,7 +70,7 @@ class ActivityLogTable extends ZfQueryBasedTable
             }
 
             // multi column key :(
-            if ($type === 'service') {
+            if ($type === 'service' || $this->hasObjectFilter) {
                 $object = "\"$name\"";
             } else {
                 $object = Link::create(
@@ -97,6 +99,7 @@ class ActivityLogTable extends ZfQueryBasedTable
 
     public function filterObject($type, $name)
     {
+        $this->hasObjectFilter = true;
         $this->filters[] = ['l.object_type = ?', $type];
         $this->filters[] = ['l.object_name = ?', $name];
         $this->extraParams = [