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

// fix remove button delete for AdminCountriesController

Browse Source
This commit is contained in:
lLefevre
2011-11-29 15:18:10 +00:00
parent e46eb40d38
commit b52fc26472
2 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/header.inc.php
+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').'
controllers/admin/AdminCountriesController.php
+34 -40
View File
@@ -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;
@@ -111,7 +110,7 @@ class AdminCountriesControllerCore extends AdminController
parent::__construct(); parent::__construct();
} }
/** /**
* AdminController::setMedia() override * AdminController::setMedia() override
* @see AdminController::setMedia() * @see AdminController::setMedia()
@@ -119,7 +118,7 @@ class AdminCountriesControllerCore extends AdminController
public function setMedia() public function setMedia()
{ {
parent::setMedia(); parent::setMedia();
$this->addJqueryPlugin('fieldselection'); $this->addJqueryPlugin('fieldselection');
} }
@@ -358,48 +357,43 @@ class AdminCountriesControllerCore extends AdminController
public function postProcess() public function postProcess()
{ {
if (isset($_GET['delete'.$this->table]) || Tools::getValue('submitDel'.$this->table)) if (Tools::getValue('submitAdd'.$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)) $id_country = Tools::getValue('id_country');
$tmp_addr_format = new AddressFormat($id_country);
$save_status = false;
$is_new = is_null($tmp_addr_format->id_country);
if ($is_new)
{ {
$id_country = Tools::getValue('id_country'); $tmp_addr_format = new AddressFormat();
$tmp_addr_format = new AddressFormat($id_country); $tmp_addr_format->id_country = $id_country;
$save_status = false;
$is_new = is_null($tmp_addr_format->id_country);
if ($is_new)
{
$tmp_addr_format = new AddressFormat();
$tmp_addr_format->id_country = $id_country;
}
$object = new $this->className();
$this->updateAssoShop($object->id);
$tmp_addr_format->format = Tools::getValue('address_layout');
if (strlen($tmp_addr_format->format) > 0)
{
if ($tmp_addr_format->checkFormatFields())
$save_status = ($is_new) ? $tmp_addr_format->save(): $tmp_addr_format->update();
else
{
$error_list = $tmp_addr_format->getErrorList();
foreach ($error_list as $num_error => $error)
$this->_errors[] = $error;
}
if (!$save_status)
$this->_errors[] = Tools::displayError('Invalid address layout'.Db::getInstance()->getMsgError());
}
unset($tmp_addr_format);
} }
return parent::postProcess(); $object = new $this->className();
$this->updateAssoShop($object->id);
$tmp_addr_format->format = Tools::getValue('address_layout');
if (strlen($tmp_addr_format->format) > 0)
{
if ($tmp_addr_format->checkFormatFields())
$save_status = ($is_new) ? $tmp_addr_format->save(): $tmp_addr_format->update();
else
{
$error_list = $tmp_addr_format->getErrorList();
foreach ($error_list as $num_error => $error)
$this->_errors[] = $error;
}
if (!$save_status)
$this->_errors[] = Tools::displayError('Invalid address layout'.Db::getInstance()->getMsgError());
}
unset($tmp_addr_format);
} }
return parent::postProcess();
} }
private function displayValidFields() private function displayValidFields()