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

CustomvarTable, SyncRunDetails: small fixes

This commit is contained in:
Thomas Gelf 2018-05-09 10:35:52 +02:00
parent df83c9abad
commit 05bc9e5bfc
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Director/Web/Table/CustomvarTable.php
View File

@ -2,6 +2,7 @@
namespace Icinga\Module\Director\Web\Table; namespace Icinga\Module\Director\Web\Table;
use dipl\Html\Html;
use dipl\Html\Link; use dipl\Html\Link;
use dipl\Web\Table\ZfQueryBasedTable; use dipl\Web\Table\ZfQueryBasedTable;
use Zend_Db_Adapter_Abstract as ZfDbAdapter; use Zend_Db_Adapter_Abstract as ZfDbAdapter;
@ -24,7 +25,7 @@ class CustomvarTable extends ZfQueryBasedTable
]); ]);
foreach ($this->getObjectTypes() as $type) { foreach ($this->getObjectTypes() as $type) {
$tr->add($this::td($this::nobr(sprintf( $tr->add($this::td(Html::tag('nobr', null, sprintf(
$this->translate('%d / %d'), $this->translate('%d / %d'),
$row->{"cnt_$type"}, $row->{"cnt_$type"},
$row->{"distinct_$type"} $row->{"distinct_$type"}

11
library/Director/Web/Widget/SyncRunDetails.php
View File

@ -2,6 +2,7 @@
namespace Icinga\Module\Director\Web\Widget; namespace Icinga\Module\Director\Web\Widget;
use dipl\Html\HtmlDocument;
use Icinga\Module\Director\Db; use Icinga\Module\Director\Db;
use Icinga\Module\Director\Objects\SyncRun; use Icinga\Module\Director\Objects\SyncRun;
use dipl\Html\Html; use dipl\Html\Html;
@ -27,6 +28,12 @@ class SyncRunDetails extends NameValueTable
]); ]);
} }
/**
* @param SyncRun $run
* @return array
* @throws \Icinga\Exception\IcingaException
* @throws \Icinga\Exception\ProgrammingError
*/
protected function runSummary(SyncRun $run) protected function runSummary(SyncRun $run)
{ {
$html = []; $html = [];
@ -57,7 +64,7 @@ class SyncRunDetails extends NameValueTable
$lastId $lastId
); );
$links = new Html(); $links = new HtmlDocument();
$links->setSeparator(', '); $links->setSeparator(', ');
if ($run->objects_created > 0) { if ($run->objects_created > 0) {
$links->add(new Link( $links->add(new Link(
@ -88,7 +95,7 @@ class SyncRunDetails extends NameValueTable
)); ));
} }
if ($links->hasContent()) { if (! $links->isEmpty()) {
$html[] = ': '; $html[] = ': ';
$html[] = $links; $html[] = $links;
} }