From d54a1a7b96160ba788209f60c9ae0a6bbc0fccda Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Tue, 13 Aug 2019 10:43:36 +0200
Subject: [PATCH] Fix load from shared catalog
---
php/classes/TimeTableMgr.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/php/classes/TimeTableMgr.php b/php/classes/TimeTableMgr.php
index 42d3895..b0adb01 100644
--- a/php/classes/TimeTableMgr.php
+++ b/php/classes/TimeTableMgr.php
@@ -433,17 +433,18 @@ class TimeTableMgr extends AmdaObjectMgr
*/
public function loadIntervalsFromObject($id, $typeTT = '', $start = null, $limit = null)
{
- if ($typeTT == 'sharedtimeTable') {
+ if ($typeTT == 'sharedtimeTable' || $typeTT == 'sharedcatalog') {
//Shared object
$sharedObjMgr = new SharedObjectsMgr();
- $path = $sharedObjMgr->getDataFilePath('timeTable', $id);
+ $sharedType = ($typeTT == 'sharedcatalog') ? 'catalog' : 'timeTable';
+ $path = $sharedObjMgr->getDataFilePath($sharedType, $id);
} else {
$path = USERTTDIR . $id . '.xml';
}
//load intervals from TT id
if (!file_exists($path)) {
- return ['success' => false, 'message' => "Cannot find TT file " . $id];
+ return ['success' => false, 'message' => "Cannot find TT file " . $id ];
}
$this->objectDom->load($path);
--
libgit2 0.21.2