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

DirectorObjectForm: use Branch, not UUID

Browse Source
This commit is contained in:
Thomas Gelf 2021-08-25 13:00:56 +02:00
parent 8a280619ad
commit b898041caa
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Director/Web/Controller/ObjectController.php
View File

@ -579,7 +579,7 @@ abstract class ObjectController extends ActionController
$form->setObject($object);
}
if (true || $form->supportsBranches()) {
$form->setBranchUuid($this->getBranchUuid());
$form->setBranch($this->getBranch());
}
$this->onObjectFormLoaded($form);

20
library/Director/Web/Form/DirectorObjectForm.php
View File

@ -8,6 +8,7 @@ use Icinga\Authentication\Auth;
use Icinga\Module\Director\Db;
use Icinga\Module\Director\Data\Db\DbObject;
use Icinga\Module\Director\Data\Db\DbObjectWithSettings;
use Icinga\Module\Director\Db\Branch\Branch;
use Icinga\Module\Director\Db\Branch\BranchModificationStore;
use Icinga\Module\Director\Db\Branch\IcingaObjectModification;
use Icinga\Module\Director\Exception\NestingError;
@ -20,7 +21,6 @@ use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Module\Director\Util;
use Icinga\Module\Director\Web\Form\Element\ExtensibleSet;
use Icinga\Module\Director\Web\Form\Validate\NamePattern;
use Ramsey\Uuid\UuidInterface;
use Zend_Form_Element as ZfElement;
use Zend_Form_Element_Select as ZfSelect;
@ -40,8 +40,8 @@ abstract class DirectorObjectForm extends DirectorForm
/** @var IcingaObject */
protected $object;
/** @var UuidInterface|null */
protected $branchUuid;
/** @var Branch */
protected $branch;
protected $objectName;
@ -677,7 +677,7 @@ abstract class DirectorObjectForm extends DirectorForm
: $this->translate('A new %s has successfully been created'),
$this->translate($this->getObjectShortClassName())
);
if ($this->branchUuid) {
if ($this->branch && $this->branch->isBranch()) {
if ($object->shouldBeRenamed()) {
$this->getElement('object_name')->addError(
$this->translate('Renaming objects in branches is not (yet) supported')
@ -689,7 +689,7 @@ abstract class DirectorObjectForm extends DirectorForm
$store->store(
IcingaObjectModification::getModification($object),
$object->get('id'),
$this->branchUuid
$this->branch->getUuid()
);
} else {
$object->store($this->db);
@ -933,12 +933,12 @@ abstract class DirectorObjectForm extends DirectorForm
);
}
if ($this->branchUuid) {
if ($this->branch && $this->branch->isBranch()) {
$store = new BranchModificationStore($this->getDb(), $object->getShortTableName());
$store->store(
IcingaObjectModification::delete($object),
$object->get('id'),
$this->branchUuid
$this->branch->getUuid()
);
$this->setSuccessUrl($url);
@ -1730,9 +1730,11 @@ abstract class DirectorObjectForm extends DirectorForm
return Util::hasPermission($permission);
}
public function setBranchUuid(UuidInterface $uuid = null)
public function setBranch(Branch $branch)
{
$this->branchUuid = $uuid;
$this->branch = $branch;
return $this;
}
protected function allowsExperimental()