CDPP / AMDA_IHM

Commit d54a1a7b96160ba788209f60c9ae0a6bbc0fccda

Authored by Benjamin Renard
1 parent 8be9a1a8
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

Fix load from shared catalog

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/classes/TimeTableMgr.php
  Diff comments   View file @d54a1a7
... ... @@ -433,17 +433,18 @@ class TimeTableMgr extends AmdaObjectMgr
433 433 */
434 434 public function loadIntervalsFromObject($id, $typeTT = '', $start = null, $limit = null)
435 435 {
436   - if ($typeTT == 'sharedtimeTable') {
  436 + if ($typeTT == 'sharedtimeTable' || $typeTT == 'sharedcatalog') {
437 437 //Shared object
438 438 $sharedObjMgr = new SharedObjectsMgr();
439   - $path = $sharedObjMgr->getDataFilePath('timeTable', $id);
  439 + $sharedType = ($typeTT == 'sharedcatalog') ? 'catalog' : 'timeTable';
  440 + $path = $sharedObjMgr->getDataFilePath($sharedType, $id);
440 441 } else {
441 442 $path = USERTTDIR . $id . '.xml';
442 443 }
443 444  
444 445 //load intervals from TT id
445 446 if (!file_exists($path)) {
446   - return ['success' => false, 'message' => "Cannot find TT file " . $id];
  447 + return ['success' => false, 'message' => "Cannot find TT file " . $id ];
447 448 }
448 449  
449 450 $this->objectDom->load($path);
... ...