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

Merge pull request #1812 from Icinga/bugfix/arguments-dsl 

IcingaArguments: Import Icinga DSL in arguments when available from baskets
This commit is contained in:
Markus Frosch 2019-03-28 15:31:11 +01:00 committed by GitHub
parent 0d3649ce3f 6c00d1735d
commit 3479c4a65c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Director/Objects/IcingaArguments.php
View File

@ -141,13 +141,19 @@ class IcingaArguments implements Iterator, Countable, IcingaConfigRenderer
}
}
if (property_exists($value, 'type')) {
// argument is directly set as function, no further properties
if ($value->type === 'Function') {
$attrs['argument_value'] = '/* Unable to fetch function body through API */';
$attrs['argument_format'] = 'expression';
}
} elseif (property_exists($value, 'value')) {
// argument is a dictionary with further settings
if (is_object($value->value)) {
if ($value->value->type === 'Function') {
if ($value->value->type === 'Function' && property_exists($value->value, 'body')) {
// likely an export from Baskets that contains the actual function body
$attrs['argument_value'] = $value->value->body;
$attrs['argument_format'] = 'expression';
} elseif ($value->value->type === 'Function') {
$attrs['argument_value'] = '/* Unable to fetch function body through API */';
$attrs['argument_format'] = 'expression';
} else {