tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ConfigController: no branch activity when...

Browse Source 
...for id ranges
This commit is contained in:
Thomas Gelf 2021-10-05 23:24:52 +02:00
parent f0d63ad23b
commit 6a68a2c3d8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/ConfigController.php
View File

@ -432,6 +432,9 @@ class ConfigController extends ActionController
protected function showOptionalBranchActivity() protected function showOptionalBranchActivity()
{ {
if ($this->url()->hasParam('idRangeEx')) {
return;
}
$branch = $this->getBranch(); $branch = $this->getBranch();
if ($branch->isBranch() && (int) $this->params->get('page', '1') === 1) { if ($branch->isBranch() && (int) $this->params->get('page', '1') === 1) {
$table = new BranchActivityTable($branch->getUuid(), $this->db()); $table = new BranchActivityTable($branch->getUuid(), $this->db());
@ -443,12 +446,12 @@ class ConfigController extends ActionController
$this->Auth(), $this->Auth(),
$this->translate('configuration branch') $this->translate('configuration branch')
)))); ))));
$table = new BranchActivityTable($branch->getUuid(), $this->db());
$this->content()->add($table); $this->content()->add($table);
$this->content()->add(Html::tag('br')); $this->content()->add(Html::tag('br'));
$this->content()->add(Hint::ok($this->translate( $this->content()->add(Hint::ok($this->translate(
'...and the modifications below are already in the main branch:' '...and the modifications below are already in the main branch:'
))); )));
$this->content()->add(Html::tag('br'));
} }
} }
} }