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/AdminEmployeesController.php
+25
View File
@@ -33,6 +33,9 @@ class AdminEmployeesControllerCore extends AdminController
/** @var array themes list*/
private $themes = array();
/** @var array tabs list*/
private $tabs_list = array();
public function __construct()
{
$this->table = 'employee';
@@ -111,6 +114,21 @@ class AdminEmployeesControllerCore extends AdminController
if (file_exists($path.$theme.'/css/admin.css'))
$this->themes[] = $theme;
$home_tab = Tab::getInstanceFromClassName('adminHome');
$this->tabs_list[$home_tab->id] = array(
'name' => $home_tab->name[$this->context->language->id],
'id_tab' => $home_tab->id,
'children' => array(array('id_tab' =>$home_tab->id, 'name' => $home_tab->name[$this->context->language->id])));
foreach (Tab::getTabs($this->context->language->id, 0) as $tab)
{
if (Tab::checkTabRights($tab['id_tab']))
{
$this->tabs_list[$tab['id_tab']] = $tab;
foreach (Tab::getTabs($this->context->language->id, $tab['id_tab']) as $children)
if (Tab::checkTabRights($children['id_tab']))
$this->tabs_list[$tab['id_tab']]['children'][] = $children;
}
}
parent::__construct();
// An employee can edit its own profile
@@ -188,6 +206,13 @@ class AdminEmployeesControllerCore extends AdminController
'size' => 20,
'desc' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
),
array(
'type' => 'default_tab',
'label' => $this->l('Default tab'),
'name' => 'default_tab',
'desc' => $this->l('This tab will be displayed just after login'),
'options' => $this->tabs_list
),
array(
'type' => 'text',
'label' => $this->l('Back office width'),
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)));