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

// Refactor AdminController::_errors to errors

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12331 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-01-11 08:58:12 +00:00
parent 3b5be15831
commit ad1fd29cea
68 changed files with 857 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStatusesController.php
+4 -4
View File
@@ -495,7 +495,7 @@ class AdminStatusesControllerCore extends AdminController
// Update object
if (!$order_return_state->save())
$this->_errors[] = Tools::displayError('An error has occured: Can\'t save the current order return state');
$this->errors[] = Tools::displayError('An error has occured: Can\'t save the current order return state');
else
Tools::redirectAdmin(self::$currentIndex.'&conf=4&token='.$this->token);
}
@@ -522,7 +522,7 @@ class AdminStatusesControllerCore extends AdminController
{
$order_state = new OrderState($_GET['id_order_state'], $this->context->language->id);
if (!$order_state->isRemovable())
$this->_errors[] = $this->l('For security reasons, you cannot delete default order statuses.');
$this->errors[] = $this->l('For security reasons, you cannot delete default order statuses.');
else
return parent::postProcess();
}
@@ -533,11 +533,11 @@ class AdminStatusesControllerCore extends AdminController
$order_state = new OrderState($selection, $this->context->language->id);
if (!$order_state->isRemovable())
{
$this->_errors[] = $this->l('For security reasons, you cannot delete default order statuses.');
$this->errors[] = $this->l('For security reasons, you cannot delete default order statuses.');
break;
}
}
if (empty($this->_errors))
if (empty($this->errors))
return parent::postProcess();
}
else