Commit cbbbdc34203be64851f59820592f4cea77681ab7
1 parent
37f1898e
Exists in
master
and in
102 other branches
param description in tree tooltip, rm 6914
Showing
1 changed file
with
28 additions
and
4 deletions
Show diff stats
php/classes/AmdaAction.php
| ... | ... | @@ -189,7 +189,20 @@ class AmdaAction |
| 189 | 189 | case 'alias': |
| 190 | 190 | $info = $id; |
| 191 | 191 | $id = 'alias_'.$id; |
| 192 | + $component_info = array(); | |
| 193 | + if ($child->hasAttribute("index1")) | |
| 194 | + $component_info["index1"] = $child->getAttribute('index1'); | |
| 195 | + if ($child->hasAttribute("index2")) | |
| 196 | + $component_info["index2"] = $child->getAttribute('index2'); | |
| 197 | + | |
| 198 | + if ($child->hasAttribute("parentId")) | |
| 199 | + $component_info["parentId"] = $child->getAttribute("parentId"); | |
| 200 | + | |
| 201 | + if ($child->hasAttribute("iconCls")) | |
| 202 | + $iconCls = $child->getAttribute("iconCls"); | |
| 203 | + | |
| 192 | 204 | if ($isLeaf) $isParameter = true; |
| 205 | + | |
| 193 | 206 | break; |
| 194 | 207 | |
| 195 | 208 | case 'timeTable': |
| ... | ... | @@ -254,8 +267,16 @@ class AmdaAction |
| 254 | 267 | // } |
| 255 | 268 | } |
| 256 | 269 | |
| 257 | - if ($child->hasAttribute('units')) $info = $child->getAttribute('units'); | |
| 258 | - | |
| 270 | + if ($child->hasAttribute('units')) { | |
| 271 | + | |
| 272 | + $units = $child->getAttribute('units'); | |
| 273 | + | |
| 274 | + if ($child->hasAttribute('description')) | |
| 275 | + $info = $child->getAttribute('description')."<br/>".$units; | |
| 276 | + else | |
| 277 | + $info = $units; | |
| 278 | + } | |
| 279 | + | |
| 259 | 280 | if ($child->tagName == 'parameter') { |
| 260 | 281 | $isParameter = true; |
| 261 | 282 | |
| ... | ... | @@ -561,7 +582,9 @@ class AmdaAction |
| 561 | 582 | } |
| 562 | 583 | |
| 563 | 584 | $childrenToReturn[] = array('text' => $name, 'id' => $id, 'nodeType' => $nodeType, 'info' => $info, |
| 564 | - 'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2); | |
| 585 | + 'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2, | |
| 586 | + 'component_info' => isset($component_info) ? $component_info : NULL, | |
| 587 | + 'iconCls' => isset($iconCls) ? $iconCls : NULL ); | |
| 565 | 588 | } |
| 566 | 589 | } |
| 567 | 590 | // if $childrenToReturn we have to return [] |
| ... | ... | @@ -915,7 +938,8 @@ class AmdaAction |
| 915 | 938 | } |
| 916 | 939 | |
| 917 | 940 | private function executeRequest($obj, $function) |
| 918 | - { | |
| 941 | + { | |
| 942 | + | |
| 919 | 943 | // Check user if access to DD Server and / or possible 'space consuming' action |
| 920 | 944 | if ( $function == FunctionTypeEnumClass::PARAMS || |
| 921 | 945 | $function == FunctionTypeEnumClass::ACTION || |
| ... | ... |