CDPP / AMDA_IHM

Commit 5310339a471c897f006efe1f106a875bf3e12467

Authored by Benjamin Renard
1 parent 75492fe8
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, akkodis/amdadev, 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, 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

Fix some minors bugs

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @5310339
... ... @@ -471,7 +471,7 @@ class AmdaAction
471 471 $childrenToReturn[] = array('text' => $name,'alias' => $alias,
472 472 'id' => $id,'nodeType' => $nodeType, 'info' => $info, 'help' => $help, 'globalStart' => $globalStart,
473 473 'globalStop' => $globalStop, 'leaf' => $isLeaf, 'disable' => $disable, 'isParameter' => $isParameter,
474   - 'isScatter' => $isScatter, 'isSpectra' => $isSpectra, 'needsArgs' => $needsArgs, "component_info" => $component_info);
  474 + 'isScatter' => $isScatter, 'isSpectra' => $isSpectra, 'needsArgs' => $needsArgs, "component_info" => isset($component_info) ? $component_info : NULL);
475 475 else
476 476 $childrenToReturn[] = array('text' => $name,'alias' => $alias,
477 477 'id' => $id,'nodeType' => $nodeType, 'info' => $info, 'help' => $help,
... ...
php/classes/AmdaObjectMgr.php
  Diff comments   View file @5310339
... ... @@ -112,7 +112,7 @@ class AmdaObjectMgr
112 112 }
113 113  
114 114 protected function createObjectResource(){}
115   - protected function renameInResource(){}
  115 + protected function renameInResource($name, $id){}
116 116  
117 117 /*
118 118 * Write Object into desc file
... ...
php/classes/UserMgr.php
  Diff comments   View file @5310339
... ... @@ -137,7 +137,7 @@ class UserMgr
137 137 {
138 138 $info = $this->amdaClient->getUserInfo($this->user);
139 139  
140   - if ($info['group'] == '')
  140 + if (empty($info['group']))
141 141 return null;
142 142 else
143 143 return explode(',',$info['group']);
... ... @@ -452,7 +452,7 @@ unlink(USERWSDIR.'RemoteParams.xml');
452 452  
453 453 $centerNode->setAttribute('name', $base->getAttribute('name'));
454 454 $centerNode->setAttribute('desc', $base->getAttribute('desc'));
455   - $centerNode->setAttribute('available',!$notAvailable);
  455 + $centerNode->setAttribute('available',isset($notAvailable) ? !$notAvailable : TRUE);
456 456 $BASE->appendChild($centerNode);
457 457 }
458 458 $paramMgr->xmlDom->appendChild($BASE);
... ...