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

// Refactor AdminController::_errors to errors

Browse Source
This commit is contained in:
tDidierjean
2012-01-11 08:58:12 +00:00
parent 9a607a1610
commit 8a757aaa9c
68 changed files with 857 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminShopController.php
+10 -10
View File
@@ -198,12 +198,12 @@ class AdminShopControllerCore extends AdminController
$this->loadObject() && $this->loadObject()->active)
{
if (Tools::getValue('id_shop') == Configuration::get('PS_SHOP_DEFAULT'))
$this->_errors[] = Tools::displayError('You cannot disable the default shop.');
$this->errors[] = Tools::displayError('You cannot disable the default shop.');
else if (Shop::getTotalShops() == 1)
$this->_errors[] = Tools::displayError('You cannot disable the last shop.');
$this->errors[] = Tools::displayError('You cannot disable the last shop.');
}
if ($this->_errors)
if ($this->errors)
return false;
return parent::postProcess();
}
@@ -211,11 +211,11 @@ class AdminShopControllerCore extends AdminController
public function processDelete($token)
{
if (!Validate::isLoadedObject($object = $this->loadObject()))
$this->_errors[] = Tools::displayError('Unable to load this shop.');
$this->errors[] = Tools::displayError('Unable to load this shop.');
else if(!Shop::has_dependency($object->id))
return $object->deleteCategories() && parent::processDelete($token);
else
$this->_errors[] = Tools::displayError('You can\'t delete this shop (customer and/or order dependency)');
$this->errors[] = Tools::displayError('You can\'t delete this shop (customer and/or order dependency)');
return false;
}
@@ -452,18 +452,18 @@ class AdminShopControllerCore extends AdminController
/* Checking fields validity */
$this->validateRules();
if (!count($this->_errors))
if (!count($this->errors))
{
$object = new $this->className();
$this->copyFromPost($object, $this->table);
$this->beforeAdd($object);
if (!$object->add())
{
$this->_errors[] = Tools::displayError('An error occurred while creating object.').
$this->errors[] = Tools::displayError('An error occurred while creating object.').
' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
}
/* voluntary do affectation here */
else if (($_POST[$this->identifier] = $object->id) && $this->postImage($object->id) && !count($this->_errors) && $this->_redirect)
else if (($_POST[$this->identifier] = $object->id) && $this->postImage($object->id) && !count($this->errors) && $this->_redirect)
{
$parent_id = (int)Tools::getValue('id_parent', 1);
$this->afterAdd($object);
@@ -480,8 +480,8 @@ class AdminShopControllerCore extends AdminController
}
}
$this->_errors = array_unique($this->_errors);
if (count($this->_errors) > 0)
$this->errors = array_unique($this->errors);
if (count($this->errors) > 0)
return;
$shop = new Shop($object->id);