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

// Fix new combination form submit

Browse Source
This commit is contained in:
tDidierjean
2012-01-16 10:48:51 +00:00
parent 4c525f7f6f
commit 767591a436
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+10 -9
View File
@@ -543,16 +543,17 @@ class AdminProductsControllerCore extends AdminController
public function processProductAttribute($token) public function processProductAttribute($token)
{ {
if (!Combination::isFeatureActive()) // Don't process if the combination fields have not been submitted
if (!Combination::isFeatureActive() || !isset($_POST['attribute']))
return; return;
$is_virtual = (int)Tools::getValue('is_virtual'); $is_virtual = (int)Tools::getValue('is_virtual');
if (Validate::isLoadedObject($product = new Product((int)(Tools::getValue('id_product'))))) if (Validate::isLoadedObject($product = $this->object))
{ {
if (!isset($_POST['attribute_price']) || $_POST['attribute_price'] == null) if (!isset($_POST['attribute_price']) || $_POST['attribute_price'] == null)
$this->errors[] = Tools::displayError('Attribute price required.'); $this->errors[] = Tools::displayError('Attribute price required.');
if (!isset($_POST['attribute_combinaison_list']) || !count($_POST['attribute_combinaison_list'])) if (!isset($_POST['attribute_combinaison_list']) || empty($_POST['attribute_combinaison_list']))
$this->errors[] = Tools::displayError('You must add at least one attribute.'); $this->errors[] = Tools::displayError('You must add at least one attribute.');
if (!count($this->errors)) if (!count($this->errors))
@@ -1450,10 +1451,13 @@ class AdminProductsControllerCore extends AdminController
if (isset($id) && !empty($id)) if (isset($id) && !empty($id))
{ {
$object = new $this->className($id); $object = new $this->className($id);
$this->object = $object;
if (Validate::isLoadedObject($object)) if (Validate::isLoadedObject($object))
{ {
$this->_removeTaxFromEcotax(); $this->_removeTaxFromEcotax();
$this->copyFromPost($object, $this->table); $this->copyFromPost($object, $this->table);
if ($object->update()) if ($object->update())
{ {
$this->addCarriers(); $this->addCarriers();
@@ -1470,20 +1474,17 @@ class AdminProductsControllerCore extends AdminController
$this->processWarehouses($token); $this->processWarehouses($token);
$this->processFeatures($token); $this->processFeatures($token);
$this->processProductAttribute($token); $this->processProductAttribute($token);
$languages = Language::getLanguages(false);
if (!$this->updatePackItems($object)) if (!$this->updatePackItems($object))
$this->errors[] = Tools::displayError('An error occurred while adding products to the pack.'); $this->errors[] = Tools::displayError('An error occurred while adding products to the pack.');
else if (!$object->updateCategories($_POST['categoryBox'], true)) else if (!$object->updateCategories($_POST['categoryBox'], true))
$this->errors[] = Tools::displayError('An error occurred while linking object.').' <b>'.$this->table.'</b> '.Tools::displayError('To categories'); $this->errors[] = Tools::displayError('An error occurred while linking object.').' <b>'.$this->table.'</b> '.Tools::displayError('To categories');
else if (!$this->updateTags($languages, $object)) else if (!$this->updateTags(Language::getLanguages(false), $object))
$this->errors[] = Tools::displayError('An error occurred while adding tags.'); $this->errors[] = Tools::displayError('An error occurred while adding tags.');
else else if (empty($this->errors))
{ {
//self::$currentIndex .= '&image_updated='.$id_image;
Hook::exec('actionProductUpdate', array('product' => $object)); Hook::exec('actionProductUpdate', array('product' => $object));
Search::indexation(false, $object->id); Search::indexation(false, $object->id);
//if (Tools::getValue('resizer') == 'man' && isset($id_image) && is_int($id_image) && $id_image)
// $this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&edit='.strval(Tools::getValue('productCreated')).'&id_image='.$id_image.'&imageresize&toconf=4&submitAddAndStay='.((Tools::isSubmit('submitAdd'.$this->table.'AndStay') || Tools::getValue('productCreated') == 'on') ? 'on' : 'off').'&token='.(($token ? $token : $this->token));
// Save and preview // Save and preview
if (Tools::isSubmit('submitAddProductAndPreview')) if (Tools::isSubmit('submitAddProductAndPreview'))
js/attributesBack.js
+6 -1
View File
@@ -369,5 +369,10 @@ function openCloseLayer(whichLayer)
} }
$(document).ready(function(){ $(document).ready(function(){
$('#product_form').submit(function(){attr_selectall();console.log('couou');}); $('#product_form').submit(function(){
attr_selectall();
// If the new combination form is hidden, remove it so that empty fields are not submitted
if ($('#add_new_combination').is(':hidden'))
$('#add_new_combination').remove();
});
}); });