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

[BO] Fix IE bug for adding Images

Browse Source
This commit is contained in:
rMontagne
2011-12-26 13:15:00 +00:00
parent 871964a3b9
commit be9bf53844
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+6 -5
View File
@@ -1041,13 +1041,14 @@ class AdminProductsControllerCore extends AdminController
self::$currentIndex = 'index.php?tab=AdminProducts'; self::$currentIndex = 'index.php?tab=AdminProducts';
$allowedExtensions = array("jpeg", "gif", "png", "jpg"); $allowedExtensions = array("jpeg", "gif", "png", "jpg");
// max file size in bytes // max file size in bytes
$sizeLimit = $this->max_file_size; $sizeLimit = $this->max_file_size == 0 ? 10485760 : $this->max_file_size;
$uploader = new FileUploader($allowedExtensions, $sizeLimit); $uploader = new FileUploader($allowedExtensions, $sizeLimit);
$result = $uploader->handleUpload(); $result = $uploader->handleUpload();
if (isset($result['success'])) if (isset($result['success']))
{ {
$obj = new Image($result['success']['id_image']); $obj = new Image($result['success']['id_image']);
$json = array( $json = array(
'name' => $result['success']['name'],
'status' => 'ok', 'status' => 'ok',
'id'=>$obj->id, 'id'=>$obj->id,
'path' => $obj->getExistingImgPath(), 'path' => $obj->getExistingImgPath(),
@@ -1269,7 +1270,7 @@ class AdminProductsControllerCore extends AdminController
$this->status = 'ok'; $this->status = 'ok';
} }
protected function _validateSpecificPrice($id_shop, $id_currency, $id_country, $id_group, $id_customer, $price, $from_quantity, $reduction, $reduction_type, $from, $to) protected function _validateSpecificPrice($id_shop, $id_currency, $id_country, $id_group, $id_customer, $price, $from_quantity, $reduction, $reduction_type, $from, $to)
{ {
if (!Validate::isUnsignedId($id_shop) || !Validate::isUnsignedId($id_currency) || !Validate::isUnsignedId($id_country) || !Validate::isUnsignedId($id_group) || !Validate::isUnsignedId($id_customer)) if (!Validate::isUnsignedId($id_shop) || !Validate::isUnsignedId($id_currency) || !Validate::isUnsignedId($id_country) || !Validate::isUnsignedId($id_group) || !Validate::isUnsignedId($id_customer))
@@ -2697,7 +2698,7 @@ class AdminProductsControllerCore extends AdminController
$input_namepack_items = Tools::getValue('namePackItems'); $input_namepack_items = Tools::getValue('namePackItems');
else else
foreach ($product->packItems as $pack_item) foreach ($product->packItems as $pack_item)
$input_namepack_items .= $pack_item->pack_quantity.' x '.$pack_item->name.'¤'; $input_namepack_items .= $pack_item->pack_quantity.' x '.$pack_item->name.'¬§';
$data->assign(array( $data->assign(array(
'product' => $product, 'product' => $product,
@@ -2979,7 +2980,7 @@ class AdminProductsControllerCore extends AdminController
$j = 0; $j = 0;
for ($i = $alreadyGenerated[Product::CUSTOMIZE_TEXTFIELD]; $i < (int)($this->getFieldValue($obj, 'text_fields')); $i++) for ($i = $alreadyGenerated[Product::CUSTOMIZE_TEXTFIELD]; $i < (int)($this->getFieldValue($obj, 'text_fields')); $i++)
$customizableFieldIds[] = 'newLabel_'.Product::CUSTOMIZE_TEXTFIELD.'_'.$j++; $customizableFieldIds[] = 'newLabel_'.Product::CUSTOMIZE_TEXTFIELD.'_'.$j++;
return implode('¤', $customizableFieldIds); return implode('¬§', $customizableFieldIds);
} }
private function _displayLabelField(&$label, $languages, $default_language, $type, $fieldIds, $id_customization_field) private function _displayLabelField(&$label, $languages, $default_language, $type, $fieldIds, $id_customization_field)
@@ -3833,7 +3834,7 @@ class AdminProductsControllerCore extends AdminController
$input_namepack_items = Tools::getValue('namePackItems'); $input_namepack_items = Tools::getValue('namePackItems');
else else
foreach ($product->packItems as $pack_item) foreach ($product->packItems as $pack_item)
$input_namepack_items .= $pack_item->pack_quantity.' x '.$pack_item->name.'¤'; $input_namepack_items .= $pack_item->pack_quantity.' x '.$pack_item->name.'¬§';
$this->tpl_form_vars['input_namepack_items'] = $input_namepack_items; $this->tpl_form_vars['input_namepack_items'] = $input_namepack_items;
} }