CDPP / AMDA_IHM

Commit acf877057db2aca54096dd6b6c5c06757d6893cb

Authored by Elena.Budnik
1 parent 3f34cc52
Exists in master and in 109 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, akkodis/amdadev, alias, 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, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

bug in disable param

Showing 1 changed file with 7 additions and 8 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @acf8770
... ... @@ -310,21 +310,20 @@ class AmdaAction
310 310 if ($child->tagName == 'mission' || $child->tagName == 'observatory') {
311 311 $rank = $child->getAttribute('rank');
312 312 }
313   -
314   - if ($child->hasAttribute('restriction')) {
315   - $disable = $child->getAttribute('restriction') !== 'plotOnly';
316   - if (!$disable) {
317   - $info .= "<br/><b>Plot Only!!!</b>";
318   - }
319   - }
320 313  
  314 + $disable = $child->hasAttribute('group');
  315 +
321 316 if ($disable) {
322   - if ($child->hasAttribute("group") && $child->getAttribute("group") !== "TBD") {
  317 + if ($child->getAttribute("group") !== "TBD") {
323 318 $info .= "<br/><b>Restricted Access</b>";
324 319 }
325 320 else {
326 321 $info .= "<br/><b>Sorry! Not finished yet...</b>";
327 322 }
  323 + }
  324 + else {
  325 + if ($child->hasAttribute('restriction') && $child->getAttribute('restriction') == 'plotOnly')
  326 + $info .= "<br/><b>Plot Only!!!</b>";
328 327 }
329 328  
330 329 $childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType, 'info' => $info,
... ...