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

// BO performance improvements

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11016 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-12-06 18:39:37 +00:00
parent a972dae0ae
commit d171de204f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+5 -2
View File
@@ -1190,6 +1190,7 @@ class AdminControllerCore extends Controller
// Tab list // Tab list
$tabs = Tab::getTabs($this->context->language->id, 0); $tabs = Tab::getTabs($this->context->language->id, 0);
$current_id = Tab::getCurrentParentId();
foreach ($tabs as $index => $tab) foreach ($tabs as $index => $tab)
{ {
if (Tab::checkTabRights($tab['id_tab']) === true) if (Tab::checkTabRights($tab['id_tab']) === true)
@@ -1214,7 +1215,7 @@ class AdminControllerCore extends Controller
if (!file_exists(dirname(_PS_ROOT_DIR_).$img)) if (!file_exists(dirname(_PS_ROOT_DIR_).$img))
$img = str_replace('png', 'gif', $img); $img = str_replace('png', 'gif', $img);
// tab[class_name] does not contains the "Controller" suffix // tab[class_name] does not contains the "Controller" suffix
$tabs[$index]['current'] = ($tab['class_name'].'Controller' == get_class($this)) || (Tab::getCurrentParentId() == $tab['id_tab']); $tabs[$index]['current'] = ($tab['class_name'].'Controller' == get_class($this)) || ($current_id == $tab['id_tab']);
$tabs[$index]['img'] = $img; $tabs[$index]['img'] = $img;
$tabs[$index]['href'] = $this->context->link->getAdminLink($tab['class_name']); $tabs[$index]['href'] = $this->context->link->getAdminLink($tab['class_name']);
@@ -1679,7 +1680,9 @@ class AdminControllerCore extends Controller
else else
Employee::getEmployeeShopAccess((int)$this->context->employee->id); Employee::getEmployeeShopAccess((int)$this->context->employee->id);
$this->context->shop = new Shop($shop_id); // Replace existing shop if necessary
if ($this->context->shop->id != $shop_id)
$this->context->shop = new Shop($shop_id);
if ($this->ajax && method_exists($this, 'ajaxPreprocess')) if ($this->ajax && method_exists($this, 'ajaxPreprocess'))
$this->ajaxPreProcess(); $this->ajaxPreProcess();