CDPP / AMDA_IHM

Commit 11bb1a8ffcce0c41da44ebacf420bb0da0901d72

Authored by Benjamin Renard
1 parent 6bfa699d
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, 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, livraison-akka, 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 #5379

Showing 1 changed file with 3 additions and 6 deletions   Show diff stats
Inline Side-by-side
php/classes/SharedObjectTreeFile.php
  Diff comments   View file @11bb1a8
... ... @@ -143,12 +143,10 @@ class SharedObjectTreeFile {
143 143  
144 144 public function getFolderIdByObjectId($object_type, $object_id) {
145 145 $listNode = $this->getObjectListNode($object_type);
146   -
147 146 if (!isset($listNode))
148 147 return "";
149   -
  148 +
150 149 $folderNodes = $listNode->getElementsByTagName("folder");
151   -
152 150 foreach ($folderNodes as $folderNode) {
153 151 $nameAtt = $folderNode->getAttribute('name');
154 152 $idAtt = $folderNode->getAttribute('xml:id');
... ... @@ -158,11 +156,10 @@ class SharedObjectTreeFile {
158 156 $objectNodes = $folderNode->getElementsByTagName($object_type);
159 157  
160 158 foreach ($objectNodes as $objectNode) {
161   - if ($idAtt == $object_id)
  159 + if ($objectNode->getAttribute('xml:id') == $object_id)
162 160 return $idAtt;
163 161 }
164 162 }
165   -
166 163 return "";
167 164 }
168 165  
... ... @@ -286,4 +283,4 @@ class SharedObjectTreeFile {
286 283 }
287 284 }
288 285  
289   -?>
290 286 \ No newline at end of file
  287 +?>
... ...