CDPP / AMDA_IHM

Commit 5a528ac3a808c804b48e7457c4ccfc2612a91db8

Authored by Hacene SI HADJ MOHAND
2 parents d547a559 21e0d0c4
Exists in master and in 101 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, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, 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, special-params, test-merge, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @5a528ac
@@ -172,12 +172,12 @@ class AmdaAction @@ -172,12 +172,12 @@ class AmdaAction
172 break; 172 break;
173 173
174 case 'condition': 174 case 'condition':
175 - $objectMgr = new RequestMgr(); 175 + $objectMgr = new RequestMgr($nodeType);
176 $info = $objectMgr->getObject($id)->expression; 176 $info = $objectMgr->getObject($id)->expression;
177 break; 177 break;
178 178
179 case 'request': 179 case 'request':
180 - $objectMgr = new RequestMgr(); 180 + $objectMgr = new RequestMgr($nodeType);
181 $objplot = $objectMgr->getObject($id); 181 $objplot = $objectMgr->getObject($id);
182 if (isset($objplot->name)) { 182 if (isset($objplot->name)) {
183 $info = $objplot->name; 183 $info = $objplot->name;
php/classes/UserMgr.php
  Diff comments   View file @5a528ac
@@ -586,9 +586,9 @@ class UserMgr @@ -586,9 +586,9 @@ class UserMgr
586 586
587 $ok = $this->makeRemoteTree(); 587 $ok = $this->makeRemoteTree();
588 588
589 - if (!file_exists(USERWSDIR.'Request.xml')) $reqMgr = new RequestMgr(); 589 + /*if (!file_exists(USERWSDIR.'Request.xml')) $reqMgr = new RequestMgr();
590 if (!file_exists(USERWSDIR.'Tt.xml')) $ttMgr = new TimeTableMgr(); 590 if (!file_exists(USERWSDIR.'Tt.xml')) $ttMgr = new TimeTableMgr();
591 - if (!file_exists(USERWSDIR.'Alias.xml')) $ttMgr = new AliasMgr(); 591 + if (!file_exists(USERWSDIR.'Alias.xml')) $ttMgr = new AliasMgr();*/
592 592
593 //TODO sessionID = user + WSname 593 //TODO sessionID = user + WSname
594 $sessionID = $this->user; 594 $sessionID = $this->user;