CDPP / AMDA_IHM

Commit 0f5fecfc5a78ba0304e6e66885ced751d440d616

Authored by Elena.Budnik
1 parent 1907172b
Exists in master and in 111 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, 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

only "restriction" attribute for all nodes

Showing 1 changed file with 9 additions and 25 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @0f5fecf
... ... @@ -222,8 +222,8 @@ class AmdaAction {
222 222 $info .= "Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop')."<br/>";
223 223 }
224 224  
225   - if ($child->getAttribute('restricted') > 1) {
226   - $restricted = $child->getAttribute('restricted');
  225 + if ($child->getAttribute('restriction') > 1) {
  226 + $restricted = $child->getAttribute('restriction');
227 227 $info .= "<b>Time Restriction</b>: -$restricted days<br/>";
228 228 }
229 229  
... ... @@ -243,7 +243,7 @@ class AmdaAction {
243 243 $globalStop = $child->parentNode->getAttribute('dataStop');
244 244 }
245 245  
246   - if ($child->parentNode->getAttribute('restricted') > 1 )
  246 + if ($child->parentNode->getAttribute('restriction') > 1 )
247 247 {
248 248 $timeRestriction = true;
249 249  
... ... @@ -271,7 +271,7 @@ class AmdaAction {
271 271 $globalStop = $child->parentNode->parentNode->getAttribute('dataStop');
272 272 }
273 273  
274   - if ($child->parentNode->parentNode->getAttribute('restricted') > 1)
  274 + if ($child->parentNode->parentNode->getAttribute('restriction') > 1)
275 275 {
276 276 $timeRestriction = true;
277 277  
... ... @@ -310,23 +310,7 @@ class AmdaAction {
310 310 {
311 311 $needsArgs = true;
312 312 }
313   -
314   - if ($id == 'mex_n_sw' || $id == 'mex_v_sw')
315   - {
316   - $not_yet = true;
317   -
318   - }
319   -
320   - //TODO proper conditions
321   - if (substr($id,0,3) == 'ros')
322   - {
323   - if ( !(strpos($id,'_r_') || strpos($id,'_xyz_') || strpos($id,'_cg_')
324   - || strpos($id,'_sc_') || strpos($id,'_aux_') || strpos($id,'_sw_')
325   - || strpos($id,'_tao_') ))
326   - {
327   - $not_yet = true;
328   - }
329   - }
  313 +
330 314  
331 315 $objectMgr = new AliasMgr();
332 316 $alias = $objectMgr->getAlias($id);
... ... @@ -341,12 +325,12 @@ class AmdaAction {
341 325 {
342 326 if ($child->tagName == 'mission')
343 327 {
344   - $disable = ($child->getAttribute('available') != "1");
  328 + $disable = $child->hasAttribute('restriction');
345 329 $rank = $child->getAttribute('rank');
346 330 }
347 331 else
348 332 {
349   - $disable = $child->getAttribute('restricted');
  333 + $disable = $child->hasAttribute('restriction');
350 334 }
351 335  
352 336 if ($disable)
... ... @@ -390,8 +374,8 @@ class AmdaAction {
390 374 }
391 375  
392 376 $isDeletable = $child->hasAttribute('isDeletable');
393   - $specialNode = true;
394   - $isParameter = false;
  377 + $specialNode = true;
  378 + $isParameter = false;
395 379 $isSpectra = false;
396 380  
397 381 switch ($id)
... ...