// fix remove button delete for AdminCountriesController

This commit is contained in:
lLefevre committed 2011-11-29 15:18:10 +00:00
1 parent e46eb40d38
commit b52fc26472
2 files changed
+1 -7

No files matched your search

+1 -1
View File
@@ -220,7 +220,7 @@ echo ' var html = "";
</div>'; </div>';
} }
echo '</div><span id="employee_links"> echo '</div><span id="employee_links">
<a href="index.php?controller=AdminEmployees&id_employee='.(int)Context::getContext()->employee->id.'&updateemployee&token='.Tools::getAdminTokenLite('AdminEmployees').'" class="employee" alt="">'.translate('My preferences').'</a> <a href="index.php?controller=AdminEmployees&id_employee='.(int)Context::getContext()->employee->id.'&updateemployee&token='.Tools::getAdminTokenLite('AdminEmployees').'" class="employee">'.translate('My preferences').'</a>
<span class="separator"></span> <span class="separator"></span>
<span class="employee_name"> <span class="employee_name">
'.Tools::substr(Context::getContext()->employee->firstname, 0, 1).'.&nbsp;'.htmlentities(Context::getContext()->employee->lastname, ENT_COMPAT, 'UTF-8').' '.Tools::substr(Context::getContext()->employee->firstname, 0, 1).'.&nbsp;'.htmlentities(Context::getContext()->employee->lastname, ENT_COMPAT, 'UTF-8').'
@@ -35,7 +35,6 @@ class AdminCountriesControllerCore extends AdminController
$this->deleted = false; $this->deleted = false;
$this->addRowAction('edit'); $this->addRowAction('edit');
$this->addRowAction('delete');
$this->requiredDatabase = true; $this->requiredDatabase = true;
@@ -357,10 +356,6 @@ class AdminCountriesControllerCore extends AdminController
} }
public function postProcess() public function postProcess()
{
if (isset($_GET['delete'.$this->table]) || Tools::getValue('submitDel'.$this->table))
$this->_errors[] = Tools::displayError('You cannot delete a country. If you do not want it available for customers, please disable it.');
else
{ {
if (Tools::getValue('submitAdd'.$this->table)) if (Tools::getValue('submitAdd'.$this->table))
{ {
@@ -400,7 +395,6 @@ class AdminCountriesControllerCore extends AdminController
return parent::postProcess(); return parent::postProcess();
} }
}
private function displayValidFields() private function displayValidFields()
{ {