CDPP / AMDA_IHM

Commit 183fc1af346c507760d21ede7d9b2f9a748bafa7

Authored by Myriam Bouchemit
1 parent a9cf38ab
Exists in master and in 108 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, 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

getTimeTablesCatalogsList

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
Inline Side-by-side
php/WebServices/WebServer.php
  Diff comments   View file @183fc1a
... ... @@ -126,13 +126,14 @@ class WebServer
126 126 $sharedObjMgr = new SharedObjectsMgr();
127 127 if (!@$dom->load($sharedObjMgr->getTreeFilePath()))
128 128 $this->throwError("workspaceError", "Workspace Error : Cannot load Shared TimeTable list");
  129 + $tagName = $object == "timetables" ? "timeTableList" : "catalogList";
129 130 }
130 131 else {
131 132 if (!@$dom->load(USERWSDIR.'Tt.xml'))
132 133 $this->throwError("workspaceError", "Workspace Error : Cannot load TimeTable list for ".$this->userID);
  134 + $tagName = $object == "timetables" ? "timetabList" : "catalogList";
133 135 }
134 136  
135   - $tagName = $object == "timetables" ? "timetabList" : "catalogList";
136 137 $timetabNode = $dom->getElementsByTagName($tagName);
137 138  
138 139 if ($timetabNode->length < 1){
... ...