dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix product images association for multishop #PSTEST-745

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13697 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-02-28 15:03:51 +00:00
parent 9f3ebb458a
commit 47dba548cc
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/images.tpl
+3 -3
View File
@@ -123,6 +123,7 @@
{ {
assoc = assoc.slice(0, -1); assoc = assoc.slice(0, -1);
assoc += {literal}"}"{/literal}; assoc += {literal}"}"{/literal};
assoc = jQuery.parseJSON(assoc);
} }
else else
assoc = false; assoc = false;
@@ -188,7 +189,7 @@
cover = "forbbiden"; cover = "forbbiden";
if (responseJSON.cover == "1") if (responseJSON.cover == "1")
cover = "enabled"; cover = "enabled";
imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, false) imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, responseJSON.shops)
$("#imageTable tr:last").after(responseJSON.html); $("#imageTable tr:last").after(responseJSON.html);
$("#countImage").html(parseInt($("#countImage").html()) + 1); $("#countImage").html(parseInt($("#countImage").html()) + 1);
$("#img" + id).remove(); $("#img" + id).remove();
@@ -318,8 +319,7 @@
line = line.replace("</tbody>", ""); line = line.replace("</tbody>", "");
if (shops != false) if (shops != false)
{ {
tmp = jQuery.parseJSON(shops); $.each(shops, function(key, value){
$.each(tmp, function(key, value){
if (value == 1) if (value == 1)
line = line.replace('id="' + key + '' + id + '"','id="' + key + '' + id + '" checked=checked'); line = line.replace('id="' + key + '' + id + '"','id="' + key + '' + id + '" checked=checked');
}); });
controllers/admin/AdminProductsController.php
+9
View File
@@ -1072,6 +1072,14 @@ class AdminProductsControllerCore extends AdminController
if (isset($result['success'])) if (isset($result['success']))
{ {
$obj = new Image((int)$result['success']['id_image']); $obj = new Image((int)$result['success']['id_image']);
// Associate image to shop from context
$shops = Shop::getContextListShopID();
$obj->associateTo($shops);
$json_shops = array();
foreach ($shops as $id_shop)
$json_shops[$id_shop] = true;
$json = array( $json = array(
'name' => $result['success']['name'], 'name' => $result['success']['name'],
'status' => 'ok', 'status' => 'ok',
@@ -1079,6 +1087,7 @@ class AdminProductsControllerCore extends AdminController
'path' => $obj->getExistingImgPath(), 'path' => $obj->getExistingImgPath(),
'position' => $obj->position, 'position' => $obj->position,
'cover' => $obj->cover, 'cover' => $obj->cover,
'shops' => $json_shops,
); );
@unlink(_PS_TMP_IMG_DIR_.'product_'.(int)$obj->id_product.'.jpg'); @unlink(_PS_TMP_IMG_DIR_.'product_'.(int)$obj->id_product.'.jpg');
@unlink(_PS_TMP_IMG_DIR_.'product_mini_'.(int)$obj->id_product.'.jpg'); @unlink(_PS_TMP_IMG_DIR_.'product_mini_'.(int)$obj->id_product.'.jpg');