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

//small fix

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17904 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-10-22 13:07:03 +00:00
parent 25f317e157
commit b0aa1692e9
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminLanguagesController.php
+17
View File
@@ -294,7 +294,11 @@ class AdminLanguagesControllerCore extends AdminController
else if ($object->id == $this->context->language->id)
$this->errors[] = $this->l('You cannot delete the language currently in use. Please change languages before deleting.');
else if ($this->deleteNoPictureImages((int)Tools::getValue('id_lang')) && $object->delete())
{
$this->checkEmployeeIdLang($object->id);
Tools::redirectAdmin(self::$currentIndex.'&conf=1'.'&token='.$this->token);
}
}
else
$this->errors[] = Tools::displayError('An error occurred while deleting object.').' <b>'.$this->table.'</b> '.
@@ -315,6 +319,8 @@ class AdminLanguagesControllerCore extends AdminController
{
foreach ($_POST[$this->table.'Box'] as $language)
$this->deleteNoPictureImages($language);
if (Validate::isLoadedObject($object = $this->loadObject()))
$this->checkEmployeeIdLang($object->id);
parent::postProcess();
}
}
@@ -384,7 +390,12 @@ class AdminLanguagesControllerCore extends AdminController
if ((int)$object->id == (int)Configuration::get('PS_LANG_DEFAULT'))
$this->errors[] = Tools::displayError('You cannot change the status of the default language.');
else
{
if (Validate::isLoadedObject($object))
$this->checkEmployeeIdLang($object->id);
return parent::postProcess();
}
}
else
$this->errors[] = Tools::displayError('You do not have permission to edit here.');
@@ -499,6 +510,12 @@ class AdminLanguagesControllerCore extends AdminController
$this->errors[] = '[TECHNICAL ERROR] Server unreachable';
}
}
protected function checkEmployeeIdLang($current_id_lang)
{
//update employee lang if current id lang is disabled
Db::getInstance()->execute('UPDATE `'._DB_PREFIX.'employee` set `id_lang`='.(int)Configuration::get('PS_LANG_DEFAULT').' WHERE `id_lang`='.(int)$current_id_lang);
}
}