diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php index 0bbb43d..44dfa27 100644 --- a/php/classes/AmdaAction.php +++ b/php/classes/AmdaAction.php @@ -189,7 +189,20 @@ class AmdaAction case 'alias': $info = $id; $id = 'alias_'.$id; + $component_info = array(); + if ($child->hasAttribute("index1")) + $component_info["index1"] = $child->getAttribute('index1'); + if ($child->hasAttribute("index2")) + $component_info["index2"] = $child->getAttribute('index2'); + + if ($child->hasAttribute("parentId")) + $component_info["parentId"] = $child->getAttribute("parentId"); + + if ($child->hasAttribute("iconCls")) + $iconCls = $child->getAttribute("iconCls"); + if ($isLeaf) $isParameter = true; + break; case 'timeTable': @@ -254,8 +267,16 @@ class AmdaAction // } } - if ($child->hasAttribute('units')) $info = $child->getAttribute('units'); - + if ($child->hasAttribute('units')) { + + $units = $child->getAttribute('units'); + + if ($child->hasAttribute('description')) + $info = $child->getAttribute('description')."<br/>".$units; + else + $info = $units; + } + if ($child->tagName == 'parameter') { $isParameter = true; @@ -561,7 +582,9 @@ class AmdaAction } $childrenToReturn[] = array('text' => $name, 'id' => $id, 'nodeType' => $nodeType, 'info' => $info, - 'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2); + 'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2, + 'component_info' => isset($component_info) ? $component_info : NULL, + 'iconCls' => isset($iconCls) ? $iconCls : NULL ); } } // if $childrenToReturn we have to return [] @@ -915,7 +938,8 @@ class AmdaAction } private function executeRequest($obj, $function) - { + { + // Check user if access to DD Server and / or possible 'space consuming' action if ( $function == FunctionTypeEnumClass::PARAMS || $function == FunctionTypeEnumClass::ACTION || -- libgit2 0.21.2