[-] WS : Fix bad xlink in combination association image

[-] WS : Fix duplicate id in images/products entity
PrestaShop · Sep 2, 2014 · cdcb7ef · cdcb7ef
1 parent a90fc68
commit cdcb7ef
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/classes/Combination.php b/classes/Combination.php
@@ -91,7 +91,7 @@ class CombinationCore extends ObjectModel
 		),
 		'associations' => array(
 			'product_option_values' => array('resource' => 'product_option_value'),
-			'images' => array('resource' => 'image'),
+			'images' => array('resource' => 'image', 'api' => 'images/products'),
 		),
 	);
 

diff --git a/classes/webservice/WebserviceOutputBuilder.php b/classes/webservice/WebserviceOutputBuilder.php
@@ -666,9 +666,18 @@ protected function renderFlatAssociation($object, $depth, $assoc_name, $resource
 		if (isset($this->wsResource[$assoc_name]) && is_null($this->schemaToDisplay))
 		{
 			if ($assoc_name == 'images')
-				$more_attr['xlink_resource'] = $this->wsUrl.$assoc_name.'/'.$parent_details['entities_name'].'/'.$parent_details['object_id'].'/'.$object_assoc['id'];
+			{
+				if ($parent_details['entities_name'] == 'combinations')
+				{
+					$more_attr['xlink_resource'] = $this->wsUrl.$assoc_name.'/products/'.$object->id_product.'/'.$object_assoc['id'];
+				}
+				else
+					$more_attr['xlink_resource'] = $this->wsUrl.$assoc_name.'/'.$parent_details['entities_name'].'/'.$parent_details['object_id'].'/'.$object_assoc['id'];
+			}
 			else
+			{
 				$more_attr['xlink_resource'] = $this->wsUrl.$assoc_name.'/'.$object_assoc['id'];
+			}
 		}
 		$output .= $this->setIndent($depth-1).$this->objectRender->renderNodeHeader($resource_name, array(), $more_attr);
 

diff --git a/classes/webservice/WebserviceSpecificManagementImages.php b/classes/webservice/WebserviceSpecificManagementImages.php
@@ -545,8 +545,8 @@ protected function manageEntityDeclinatedImages($directory, $normal_image_sizes)
 			foreach ($languages as $language)
 				foreach (Image::getImages($language['id_lang'], $object_id) as $image)
 					$available_image_ids[] = $image['id_image'];
-
-
+			$available_image_ids = array_unique($available_image_ids, SORT_NUMERIC);
+			
 			// If an image id is specified
 			if ($this->wsObject->urlSegment[3] != '')
 			{