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

BasketUpload: ignore Datafields, they get special 

...treatment
This commit is contained in:
Thomas Gelf 2019-02-14 21:57:10 +01:00
parent 640da36c62
commit e961f0eb2a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/forms/BasketUploadForm.php
View File

@ -122,7 +122,9 @@ class BasketUploadForm extends DirectorObjectForm
$basket = $this->object(); $basket = $this->object();
foreach ($this->upload as $type => $content) { foreach ($this->upload as $type => $content) {
$basket->addObjects($type, array_keys((array) $content)); if ($type !== 'Datafield') {
$basket->addObjects($type, array_keys((array) $content));
}
} }
if ($basket->isEmpty()) { if ($basket->isEmpty()) {
$this->addError($this->translate("It's not allowed to store an empty basket")); $this->addError($this->translate("It's not allowed to store an empty basket"));

1
library/Director/DirectorObject/Automation/Basket.php
View File

@ -61,6 +61,7 @@ class Basket extends DbObject implements ExportInterface
protected function onLoadFromDb() protected function onLoadFromDb()
{ {
$this->chosenObjects = (array) Json::decode($this->get('objects')); $this->chosenObjects = (array) Json::decode($this->get('objects'));
unset($this->chosenObjects['Datafield']); // Might be in old baskets
} }
public function getUniqueIdentifier() public function getUniqueIdentifier()