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

[-] BO : #PSFV-608 - "Access denied" message in BO when login as Logistician

Browse Source
This commit is contained in:
vAugagneur
2012-03-12 14:15:31 +00:00
parent 98708ac408
commit 526301f67d
7 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminLoginController.php
+5 -4
View File
@@ -78,7 +78,7 @@ class AdminLoginControllerCore extends AdminController
// Redirect to admin panel
if (isset($_GET['redirect']) && Validate::isControllerName($_GET['redirect']))
$redirect = $_GET['redirect'];
$this->context->smarty->assign(array('redirect' => Tools::getValue('redirect')));
if ($nbErrors = count($this->errors))
$this->context->smarty->assign(
@@ -89,8 +89,6 @@ class AdminLoginControllerCore extends AdminController
'disableDefaultErrorOutPut' => true,
)
);
$this->context->smarty->assign(array('redirect' => isset($redirect) ? $redirect : null));
$this->setMedia();
$this->initHeader();
parent::initContent();
@@ -161,7 +159,10 @@ class AdminLoginControllerCore extends AdminController
if (isset($_POST['redirect']) && Validate::isControllerName($_POST['redirect']))
$url = $this->context->link->getAdminLink($_POST['redirect']);
else
$url = $this->context->link->getAdminLink('AdminHome');
{
$tab = new Tab((int)$this->context->employee->default_tab);
$url = $this->context->link->getAdminLink($tab->class_name);
}
if (Tools::isSubmit('ajax'))
die(Tools::jsonEncode(array('hasErrors' => false, 'redirect' => $url)));