Timeperiod: fix ranges tab, refactor code

This commit is contained in:
Thomas Gelf 2017-07-28 16:50:15 +02:00
parent bcf15b2605
commit 6d1dd52229
2 changed files with 26 additions and 25 deletions

View File

@ -2,47 +2,40 @@
namespace Icinga\Module\Director\Controllers;
use Icinga\Module\Director\Forms\IcingaTimePeriodRangeForm;
use Icinga\Module\Director\Objects\IcingaTimePeriod;
use Icinga\Module\Director\Web\Controller\ObjectController;
use ipl\Html\Link;
class TimeperiodController extends ObjectController
{
public function init()
{
parent::init();
if ($this->object && $this->object->hasBeenLoadedFromDb()) {
$this->getTabs()->add('ranges', array(
'url' => 'director/timeperiod/ranges',
'urlParams' => $this->object->getUrlParams(),
'label' => $this->translate('Ranges')
));
}
}
public function rangesAction()
{
$this->getTabs()->activate('ranges');
$this->view->form = $form = $this->loadForm('icingaTimePeriodRange');
$form
->setTimePeriod($this->object)
/** @var IcingaTimePeriod $object */
$object = $this->object;
$this->tabs()->activate('ranges');
$this->addTitle($this->translate('Time period ranges'));
$form = IcingaTimePeriodRangeForm::load()
->setTimePeriod($object)
->setDb($this->db());
if ($name = $this->params->get('range')) {
$this->view->actionLinks = $this->view->qlink(
$this->actions()->add(new Link(
$this->translate('back'),
$this->getRequest()->getUrl()->without('range_id'),
$this->getRequest()->getUrl()->without('range'),
null,
array('class' => 'icon-left-big')
);
$form->loadObject(array(
['class' => 'icon-left-big']
));
$form->loadObject([
'timeperiod_id' => $this->object->id,
'range_key' => $name,
'range_type' => $this->params->get('range_type')
));
]);
}
$form->handleRequest();
$this->view->table = $this->loadTable('icingaTimePeriodRange')
$table = $this->loadTable('icingaTimePeriodRange')
->setTimePeriod($this->object);
$this->view->title = $this->translate('Time period ranges');
$this->render('object/fields', null, true); // TODO: render table
$this->content()->add([$form, $table]);
}
}

View File

@ -102,6 +102,14 @@ class ObjectTabs extends Tabs
]);
}
if ($object->supportsRanges()) {
$this->add('ranges', [
'url' => 'director/timeperiod/ranges',
'urlParams' => $object->getUrlParams(),
'label' => $this->translate('Ranges')
]);
}
if ($object->getShortTableName() === 'endpoint') {
$this->add('inspect', [
'url' => 'director/inspect/types',