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

// bug fix when trying to add files to combinations

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10201 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lBrieu committed 2011-11-17 09:54:49 +00:00
1 parent 5784a4cd46
commit 634934e6cf
1 file changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+7 -6
View File
@@ -1400,10 +1400,11 @@ if (false)
// Trick's // Trick's
if ($edit == 1) if ($edit == 1)
{ {
$id_product_download_attibute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute); $id_product_download_attribute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute);
$id_product_download = ($id_product_download_attibute) ? (int) $id_product_download_attibute : (int) Tools::getValue('virtual_product_id'); $id_product_download = ($id_product_download_attribute) ? (int) $id_product_download_attribute : (int) Tools::getValue('virtual_product_id');
} } else
$id_product_download = Tools::getValue('virtual_product_id');
$is_shareable = Tools::getValue('virtual_product_is_shareable'); $is_shareable = Tools::getValue('virtual_product_is_shareable');
$virtual_product_name = Tools::getValue('virtual_product_name'); $virtual_product_name = Tools::getValue('virtual_product_name');
$virtual_product_filename = Tools::getValue('virtual_product_filename'); $virtual_product_filename = Tools::getValue('virtual_product_filename');
@@ -1460,8 +1461,8 @@ if (false)
/* unactive download product if checkbox not checked */ /* unactive download product if checkbox not checked */
if ($edit == 1) if ($edit == 1)
{ {
$id_product_download_attibute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute); $id_product_download_attribute = ProductDownload::getIdFromIdAttribute((int) $product->id, $id_product_attribute);
$id_product_download = ($id_product_download_attibute) ? (int) $id_product_download_attibute : (int) Tools::getValue('virtual_product_id'); $id_product_download = ($id_product_download_attribute) ? (int) $id_product_download_attribute : (int) Tools::getValue('virtual_product_id');
} }
else else
$id_product_download = ProductDownload::getIdFromIdProduct($product->id); $id_product_download = ProductDownload::getIdFromIdProduct($product->id);