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

// Complete the removal of Image->legend property

Browse Source
This commit is contained in:
tDidierjean
2011-12-20 16:54:44 +00:00
parent 43b9746300
commit f06e16e6fd
4 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FileUploader.php
+2 -3
View File
@@ -161,11 +161,9 @@ class qqUploadedFileXhr
Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product)); Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product));
$lang = Context::getContext()->employee->id_lang; $lang = Context::getContext()->employee->id_lang;
foreach (Language::getLanguages(false) as $l)
$image->legend[$l['id_lang']] = $id_image." ".$p->name[$l['id_lang']]." ".$p->reference;
if (!$image->update()) if (!$image->update())
return array('error' => Tools::displayError('Error while updating status')); return array('error' => Tools::displayError('Error while updating status'));
$img = array('id_image' => $image->id, 'legend' => $image->legend[$lang], 'position' => $image->position, 'cover' => $image->cover); $img = array('id_image' => $image->id, 'position' => $image->position, 'cover' => $image->cover);
return array("success" => $img); return array("success" => $img);
} }
@@ -173,6 +171,7 @@ class qqUploadedFileXhr
{ {
return $_GET['qqfile']; return $_GET['qqfile'];
} }
function getSize() function getSize()
{ {
if (isset($_SERVER["CONTENT_LENGTH"])) if (isset($_SERVER["CONTENT_LENGTH"]))
classes/Image.php
-6
View File
@@ -35,9 +35,6 @@ class ImageCore extends ObjectModel
/** @var integer Product ID */ /** @var integer Product ID */
public $id_product; public $id_product;
/** @var string HTML title and alt attributes */
public $legend;
/** @var integer Position used to order images of the same product */ /** @var integer Position used to order images of the same product */
public $position; public $position;
@@ -70,9 +67,6 @@ class ImageCore extends ObjectModel
'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'position' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), 'position' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
'cover' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'cover' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
// Lang fields
'legend' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 128),
), ),
); );
controllers/admin/AdminImportController.php
+2 -4
View File
@@ -1130,7 +1130,6 @@ class AdminImportControllerCore extends AdminController
$image->id_product = (int)$product->id; $image->id_product = (int)$product->id;
$image->position = Image::getHighestPosition($product->id) + 1; $image->position = Image::getHighestPosition($product->id) + 1;
$image->cover = (!$key && !$product_has_images) ? true : false; $image->cover = (!$key && !$product_has_images) ? true : false;
$image->legend = self::createMultiLangField($product->name[$default_language_id]);
if (($field_error = $image->validateFields(UNFRIENDLY_ERROR, true)) === true && if (($field_error = $image->validateFields(UNFRIENDLY_ERROR, true)) === true &&
($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add()) ($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add())
{ {
@@ -1139,7 +1138,7 @@ class AdminImportControllerCore extends AdminController
} }
else else
{ {
$this->warnings[] = $image->legend[$default_language_id].(isset($image->id_product) ? ' ('.$image->id_product.')' : ''). $this->warnings[] = (isset($image->id_product) ? ' ('.$image->id_product.')' : '').
' '.Tools::displayError('Cannot be saved'); ' '.Tools::displayError('Cannot be saved');
$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : ''). $this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -1208,7 +1207,6 @@ class AdminImportControllerCore extends AdminController
$image->id_product = (int)$product->id; $image->id_product = (int)$product->id;
$image->position = Image::getHighestPosition($product->id) + 1; $image->position = Image::getHighestPosition($product->id) + 1;
$image->cover = (!$product_has_images) ? true : false; $image->cover = (!$product_has_images) ? true : false;
$image->legend = self::createMultiLangField($product->name);
if (($field_error = $image->validateFields(UNFRIENDLY_ERROR, true)) === true && if (($field_error = $image->validateFields(UNFRIENDLY_ERROR, true)) === true &&
($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add()) ($lang_field_error = $image->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $image->add())
@@ -1220,7 +1218,7 @@ class AdminImportControllerCore extends AdminController
} }
else else
{ {
$this->warnings[] = $image->legend[$default_language_id].(isset($image->id_product) ? ' ('.$image->id_product.')' : ''). $this->warnings[] = (isset($image->id_product) ? ' ('.$image->id_product.')' : '').
' '.Tools::displayError('Cannot be saved'); ' '.Tools::displayError('Cannot be saved');
$this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').mysql_error(); $this->_errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : '').mysql_error();
} }
controllers/admin/AdminProductsController.php
+21 -35
View File
@@ -483,10 +483,7 @@ class AdminProductsControllerCore extends AdminController
{ {
if ($image->cover) if ($image->cover)
$_POST['cover'] = 1; $_POST['cover'] = 1;
$languages = Language::getLanguages(false);
foreach ($languages as $language)
if (isset($image->legend[$language['id_lang']]))
$_POST['legend_'.$language['id_lang']] = $image->legend[$language['id_lang']];
$_POST['id_image'] = $image->id; $_POST['id_image'] = $image->id;
} }
@@ -795,7 +792,7 @@ class AdminProductsControllerCore extends AdminController
if (!$specificPrice->delete()) if (!$specificPrice->delete())
$this->_errors[] = Tools::displayError('An error occurred while deleting the specific price'); $this->_errors[] = Tools::displayError('An error occurred while deleting the specific price');
else else
$this->redirect_after = self::$currentIndex.(Tools::getValue('id_category') ? '&action=Prices&id_category='.Tools::getValue('id_category') : '').'&id_product='.$obj->id.'&add'.$this->table.'&conf=1&token='.($token ? $token : $this->token); $this->confirmations[] = $this->l('Specific price successfully deleted');
} }
} }
@@ -810,12 +807,12 @@ class AdminProductsControllerCore extends AdminController
if (!SpecificPrice::setPriorities($priorities)) if (!SpecificPrice::setPriorities($priorities))
$this->_errors[] = Tools::displayError('An error occurred while updating priorities.'); $this->_errors[] = Tools::displayError('An error occurred while updating priorities.');
else else
$this->redirect_after = self::$currentIndex.'&id_product='.$obj->id.'&add'.$this->table.'&action=Prices&conf=4&token='.($token ? $token : $this->token); $this->confirmations[] = $this->l('Price rule successfully updated');
} }
else if (!SpecificPrice::setSpecificPriority((int)($obj->id), $priorities)) else if (!SpecificPrice::setSpecificPriority((int)($obj->id), $priorities))
$this->_errors[] = Tools::displayError('An error occurred while setting priorities.'); $this->_errors[] = Tools::displayError('An error occurred while setting priorities.');
else else
$this->redirect_after = self::$currentIndex.(Tools::getValue('id_category') ? '&id_category='.Tools::getValue('id_category') : '').'&action=Prices&id_product='.$obj->id.'&add'.$this->table.'&conf=4&token='.($token ? $token : $this->token); $this->confirmations[] = $this->l('Price priorities successfully updated');
} }
public function processCustomizationConfiguration($token) public function processCustomizationConfiguration($token)
@@ -966,7 +963,10 @@ class AdminProductsControllerCore extends AdminController
else if (Tools::isSubmit('submitSpecificPricePriorities')) else if (Tools::isSubmit('submitSpecificPricePriorities'))
{ {
if ($this->tabAccess['edit'] === '1') if ($this->tabAccess['edit'] === '1')
{
$this->action = 'specificPricePriorities'; $this->action = 'specificPricePriorities';
$this->tab_display = 'prices';
}
else else
$this->_errors[] = Tools::displayError('You do not have permission to edit here.'); $this->_errors[] = Tools::displayError('You do not have permission to edit here.');
} }
@@ -1024,15 +1024,6 @@ class AdminProductsControllerCore extends AdminController
*/ */
public function postProcess($token = null) public function postProcess($token = null)
{ {
if ($this->action == 'attachments')
if ($id = (int)Tools::getValue($this->identifier))
{
$attachments = trim(Tools::getValue('arrayAttachments'), ',');
$attachments_tab = explode(',', $attachments);
if (Attachment::attachToProduct($id, $attachments_tab))
$this->redirect_after = self::$currentIndex.'&id_product='.(int)$id.(isset($_POST['id_category']) ? '&id_category='.(int)$_POST['id_category'] : '').'&conf=4&add'.$this->table.'&action=Attachments&token='.($token ? $token : $this->token);
}
if (!$this->redirect_after) if (!$this->redirect_after)
parent::postProcess(true); parent::postProcess(true);
} }
@@ -1247,26 +1238,22 @@ class AdminProductsControllerCore extends AdminController
public function ajaxProcessDeleteProductImage() public function ajaxProcessDeleteProductImage()
{ {
/* Delete product image */ $image = new Image((int)Tools::getValue('id_image'));
if (isset($_GET['deleteProductImage']) || $this->action == 'deleteProductImage') $image->delete();
if (!Image::getCover($image->id_product))
{ {
$image = new Image((int)Tools::getValue('id_image')); $first_img = Db::getInstance()->getRow('
$image->delete(); SELECT `id_image` FROM `'._DB_PREFIX_.'image`
if (!Image::getCover($image->id_product)) WHERE `id_product` = '.(int)$image->id_product);
{ Db::getInstance()->Execute('
$first_img = Db::getInstance()->getRow(' UPDATE `'._DB_PREFIX_.'image`
SELECT `id_image` FROM `'._DB_PREFIX_.'image` SET `cover` = 1
WHERE `id_product` = '.(int)$image->id_product); WHERE `id_image` = '.(int)$first_img['id_image']);
Db::getInstance()->Execute('
UPDATE `'._DB_PREFIX_.'image`
SET `cover` = 1
WHERE `id_image` = '.(int)$first_img['id_image']);
}
@unlink(_PS_TMP_IMG_DIR_.'/product_'.$image->id_product.'.jpg');
@unlink(_PS_TMP_IMG_DIR_.'/product_mini_'.$image->id_product.'.jpg');
$this->content = '{"status":"ok"}';
} }
@unlink(_PS_TMP_IMG_DIR_.'/product_'.$image->id_product.'.jpg');
@unlink(_PS_TMP_IMG_DIR_.'/product_mini_'.$image->id_product.'.jpg');
$this->content = '{"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)
@@ -3885,7 +3872,6 @@ class AdminProductsControllerCore extends AdminController
public function setMedia() public function setMedia()
{ {
parent::setMedia(); parent::setMedia();
if ($this->display == 'edit' || $this->display == 'add') if ($this->display == 'edit' || $this->display == 'add')
{ {
$this->addjQueryPlugin(array( $this->addjQueryPlugin(array(