From 6a68a2c3d8522ae0f7cc56069805b2bda15849df Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 5 Oct 2021 23:24:52 +0200 Subject: [PATCH] ConfigController: no branch activity when... ...for id ranges --- application/controllers/ConfigController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index a952016a..9f9d8217 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -432,6 +432,9 @@ class ConfigController extends ActionController protected function showOptionalBranchActivity() { + if ($this->url()->hasParam('idRangeEx')) { + return; + } $branch = $this->getBranch(); if ($branch->isBranch() && (int) $this->params->get('page', '1') === 1) { $table = new BranchActivityTable($branch->getUuid(), $this->db()); @@ -443,12 +446,12 @@ class ConfigController extends ActionController $this->Auth(), $this->translate('configuration branch') )))); - $table = new BranchActivityTable($branch->getUuid(), $this->db()); $this->content()->add($table); $this->content()->add(Html::tag('br')); $this->content()->add(Hint::ok($this->translate( '...and the modifications below are already in the main branch:' ))); + $this->content()->add(Html::tag('br')); } } }