From 6d781e09e3ee95a97307a2d0364ead1fdc39ad28 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 20 Sep 2019 01:37:47 +0200
Subject: [PATCH] ConfigController: fix search in id-range filtered

...activities

fixes #1381
---
 application/controllers/ConfigController.php   |  5 ++++-
 library/Director/Web/Widget/SyncRunDetails.php | 14 ++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 792d5561..d0459f48 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -142,8 +142,11 @@ class ConfigController extends ActionController
         $lastDeployedId = $this->db()->getLastDeploymentActivityLogId();
         $table = new ActivityLogTable($this->db());
         $table->setLastDeployedId($lastDeployedId);
+        if ($idRangeEx = $this->url()->getParam('idRangeEx')) {
+            $table->applyFilter(Filter::fromQueryString($idRangeEx));
+        }
         $filter = Filter::fromQueryString(
-            $this->url()->without(['page', 'limit', 'q'])->getQueryString()
+            $this->url()->without(['page', 'limit', 'q', 'idRangeEx'])->getQueryString()
         );
         $table->applyFilter($filter);
         if ($this->url()->hasParam('author')) {
diff --git a/library/Director/Web/Widget/SyncRunDetails.php b/library/Director/Web/Widget/SyncRunDetails.php
index 9f0e3a09..90eb1efe 100644
--- a/library/Director/Web/Widget/SyncRunDetails.php
+++ b/library/Director/Web/Widget/SyncRunDetails.php
@@ -58,11 +58,12 @@ class SyncRunDetails extends NameValueTable
             $formerId = $db->fetchActivityLogIdByChecksum($run->last_former_activity);
             $lastId = $db->fetchActivityLogIdByChecksum($run->last_related_activity);
 
-            $activityUrl = sprintf(
-                'director/config/activities?id>%d&id<=%d',
+            $idRangeEx = sprintf(
+                'id>%d&id<=%d',
                 $formerId,
                 $lastId
             );
+            $activityUrl = 'director/config/activities';
 
             $links = new HtmlDocument();
             $links->setSeparator(', ');
@@ -70,28 +71,29 @@ class SyncRunDetails extends NameValueTable
                 $links->add(new Link(
                     sprintf('%d created', $run->objects_created),
                     $activityUrl,
-                    ['action' => 'create']
+                    ['action' => 'create', 'idRangeEx' => $idRangeEx]
                 ));
             }
             if ($run->objects_modified > 0) {
                 $links->add(new Link(
                     sprintf('%d modified', $run->objects_modified),
                     $activityUrl,
-                    ['action' => 'modify']
+                    ['action' => 'modify', 'idRangeEx' => $idRangeEx]
                 ));
             }
             if ($run->objects_deleted > 0) {
                 $links->add(new Link(
                     sprintf('%d deleted', $run->objects_deleted),
                     $activityUrl,
-                    ['action' => 'delete']
+                    ['action' => 'delete', 'idRangeEx' => $idRangeEx]
                 ));
             }
 
             if (count($links) > 1) {
                 $links->add(new Link(
                     'Show all actions',
-                    $activityUrl
+                    $activityUrl,
+                    ['idRangeEx' => $idRangeEx]
                 ));
             }