CDPP / AMDA_IHM

Commit 3a42095385f60fff24c04751aa98f08a58f96c15

Authored by Benjamin Renard
2 parents bdcdb526 cbbbdc34
Exists in master and in 102 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot-request, special-params, test-merge, ws_get_catalog

Merge branch 'master' into save-plot-request

Showing 1 changed file with 28 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @3a42095
... ... @@ -203,7 +203,20 @@ class AmdaAction
203 203 case 'alias':
204 204 $info = $id;
205 205 $id = 'alias_'.$id;
  206 + $component_info = array();
  207 + if ($child->hasAttribute("index1"))
  208 + $component_info["index1"] = $child->getAttribute('index1');
  209 + if ($child->hasAttribute("index2"))
  210 + $component_info["index2"] = $child->getAttribute('index2');
  211 +
  212 + if ($child->hasAttribute("parentId"))
  213 + $component_info["parentId"] = $child->getAttribute("parentId");
  214 +
  215 + if ($child->hasAttribute("iconCls"))
  216 + $iconCls = $child->getAttribute("iconCls");
  217 +
206 218 if ($isLeaf) $isParameter = true;
  219 +
207 220 break;
208 221  
209 222 case 'timeTable':
... ... @@ -268,8 +281,16 @@ class AmdaAction
268 281 // }
269 282 }
270 283  
271   - if ($child->hasAttribute('units')) $info = $child->getAttribute('units');
272   -
  284 + if ($child->hasAttribute('units')) {
  285 +
  286 + $units = $child->getAttribute('units');
  287 +
  288 + if ($child->hasAttribute('description'))
  289 + $info = $child->getAttribute('description')."<br/>".$units;
  290 + else
  291 + $info = $units;
  292 + }
  293 +
273 294 if ($child->tagName == 'parameter') {
274 295 $isParameter = true;
275 296  
... ... @@ -576,7 +597,9 @@ class AmdaAction
576 597 }
577 598  
578 599 $childrenToReturn[] = array('text' => $name, 'id' => $id, 'nodeType' => $nodeType, 'info' => $info,
579   - 'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2, 'tabs' => $plotTabs);
  600 + 'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2, 'tabs' => $plotTabs,
  601 + 'component_info' => isset($component_info) ? $component_info : NULL,
  602 + 'iconCls' => isset($iconCls) ? $iconCls : NULL );
580 603 }
581 604 }
582 605 // if $childrenToReturn we have to return []
... ... @@ -932,7 +955,8 @@ class AmdaAction
932 955 }
933 956  
934 957 private function executeRequest($obj, $function)
935   - {
  958 + {
  959 +
936 960 // Check user if access to DD Server and / or possible 'space consuming' action
937 961 if ( $function == FunctionTypeEnumClass::PARAMS ||
938 962 $function == FunctionTypeEnumClass::ACTION ||
... ...