CDPP / AMDA_IHM

Commit 571a0ed35b9959278305259388de66bcb2b3a225

Authored by Benjamin Renard
2 parents 27a055f4 1c2f5368
Exists in master and in 91 other branches 10098, 10178, 5390, 6629, 6728, 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, create-user, cu2022, density_maps, develop, epn-tap, frames-transformation, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Merge branch 'master' into multiplot

Showing 1 changed file with 8 additions and 9 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @571a0ed
... ... @@ -247,11 +247,6 @@ class AmdaAction
247 247 $info .= "<br/>Last Updated: : ".$child->getAttribute('lastUpdate');
248 248 }
249 249 }
250   -
251   -// if ($child->getAttribute('restriction') > 1) {
252   -// $restricted = $child->getAttribute('restriction');
253   -// $info .= "<br/><b>Time Restriction</b>: -$restricted days";
254   -// }
255 250 }
256 251  
257 252 if ($child->hasAttribute('units')) {
... ... @@ -332,7 +327,8 @@ class AmdaAction
332 327 if ($isParameter) {
333 328 $objectMgr = new AliasMgr();
334 329 $alias = $objectMgr->getAlias($id);
335   - $info .= '</br><i>ID : '.$id.'</i>';
  330 +
  331 + if (! ($child->parentNode->hasAttribute('group') || $child->parentNode->parentNode->hasAttribute('group'))) $info .= '</br><i>ID : '.$id.'</i>';
336 332 $childrenToReturn[] = array('text' => $name,'alias' => $alias,
337 333 'id' => $id,'nodeType' => $nodeType, 'info' => $info, "component_info" => $component_info,
338 334 'globalStart' => $globalStart, 'globalStop' => $globalStop, 'timeRestriction' => $timeRestriction,
... ... @@ -353,11 +349,14 @@ class AmdaAction
353 349 if ($child->getAttribute("group") === "TBD") {
354 350 $info .= "<br/><b>Under Testing</b>";
355 351 }
356   - else {
357   - $info .= "<br/><b>Restricted Access : Group ".$child->getAttribute('group')."</b>";
  352 + else {
358 353 if (!empty($timeRestriction)) {
359 354 $disable = FALSE;
360   - $info .= "<br/><b>Time Restriction : ".$timeRestriction."</b>";
  355 + $formattedTimeRestriction = date("Y-m-d\TH:i:s\Z",strtotime($timeRestriction)+1);
  356 + $info .= "<br/><b>After $formattedTimeRestriction data are restricted to group ".$child->getAttribute('group')."</b>";
  357 + }
  358 + else {
  359 + $info .= "<br/><b>Restricted Access : Group ".$child->getAttribute('group')."</b>";
361 360 }
362 361 }
363 362 }
... ...