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

[-] BO : #PSFV-221 - Fixed bad ajax return on no manufacturers on the product tab

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12188 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte committed 2012-01-05 13:55:16 +00:00
1 parent 0787c21bd9
commit 099c3502be
2 files changed
+5 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/ajax.php
+2 -4
View File
@@ -75,13 +75,11 @@ if (Tools::isSubmit('ajaxProductManufacturers'))
{ {
AdminTab::$currentIndex = 'index.php?tab=AdminCatalog'; AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
$manufacturers = Manufacturer::getManufacturers(); $manufacturers = Manufacturer::getManufacturers();
$jsonArray = array();
if ($manufacturers) if ($manufacturers)
{
$jsonArray = array();
foreach ($manufacturers AS $manufacturer) foreach ($manufacturers AS $manufacturer)
$jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}'; $jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}';
die('['.implode(',', $jsonArray).']'); die('['.implode(',', $jsonArray).']');
}
} }
controllers/admin/AdminProductsController.php
+3 -5
View File
@@ -1949,13 +1949,11 @@ class AdminProductsControllerCore extends AdminController
public function ajaxProcessProductManufacturers() public function ajaxProcessProductManufacturers()
{ {
$manufacturers = Manufacturer::getManufacturers(); $manufacturers = Manufacturer::getManufacturers();
if ($manufacturers)
{
$jsonArray = array(); $jsonArray = array();
foreach ($manufacturers AS $manufacturer) if ($manufacturers)
$jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}'; foreach ($manufacturers AS $manufacturer)
$jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}';
die('['.implode(',', $jsonArray).']'); die('['.implode(',', $jsonArray).']');
}
} }
/** /**