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

// Bug fix when deleting a file associated to a virtual product

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10208 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lBrieu committed 2011-11-17 13:24:19 +00:00
1 parent b6ab71ecc2
commit 1f1ca31cda
1 file changed
+6 -7
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+6 -7
View File
@@ -176,19 +176,18 @@ class AdminProductsController extends AdminController
public function deleteVirtualProduct() public function deleteVirtualProduct()
{ {
if (!($id_product_download = ProductDownload::getIdFromIdProduct((int)Tools::getValue('id_product')))) if (!($id_product_download = ProductDownload::getIdFromIdAttribute((int)Tools::getValue('id_product'), 0)))
return false; return false;
$productDownload = new ProductDownload((int)($id_product_download)); $productDownload = new ProductDownload((int)($id_product_download));
return $productDownload->deleteFile(); return $productDownload->deleteFile((int)($id_product_download));
} }
public function deleteVirtualProductAttribute() public function deleteVirtualProductAttribute()
{ {
if (!($id_product_download = ProductDownload::getIdFromIdAttribute((int)Tools::getValue('id_product'), (int) Tools::getValue('id_product_attribute')))) if (!($id_product_download = ProductDownload::getIdFromIdAttribute((int)Tools::getValue('id_product'), (int) Tools::getValue('id_product_attribute'))))
return false; return false;
$productDownload = new ProductDownload((int)($id_product_download)); $productDownload = new ProductDownload((int)($id_product_download));
return $productDownload->deleteFile((int)($id_product_download));
return $productDownload->deleteFile();
} }
/** /**
@@ -659,7 +658,7 @@ class AdminProductsController extends AdminController
} }
else else
Product::updateDefaultAttribute($id_product); Product::updateDefaultAttribute($id_product);
Tools::redirectAdmin(self::$currentIndex.'&add'.$this->table.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&tabs=3&id_product='.$product->id.'&token='.($token ? $token : $this->token)); Tools::redirectAdmin(self::$currentIndex.'&add'.$this->table.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&tabs=3&id_product='.$product->id.'&token='.($token ? $token : $this->token));
} }
else else