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

//small fix for retro compat on adminTab

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17815 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-10-10 08:36:51 +00:00
parent 23dd0558d6
commit 3509b227a6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/functions.php
+2 -1
View File
@@ -410,6 +410,7 @@ function runAdminTab($tab, $ajaxMode = false)
// $tab = $_REQUEST['tab']; // $tab = $_REQUEST['tab'];
if ($adminObj = checkingTab($tab)) if ($adminObj = checkingTab($tab))
{ {
Context::getContext()->controller = $adminObj;
// init is different for new tabs (AdminController) and old tabs (AdminTab) // init is different for new tabs (AdminController) and old tabs (AdminTab)
if ($adminObj instanceof AdminController) if ($adminObj instanceof AdminController)
{ {
@@ -462,7 +463,7 @@ function runAdminTab($tab, $ajaxMode = false)
<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.translate('Back Office').'</a> <a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.translate('Back Office').'</a>
'.$bread.'</div>'; '.$bread.'</div>';
if (!$ajaxMode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL) if (!$ajaxMode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
{ {
echo '<div class="multishop_info">'; echo '<div class="multishop_info">';
if (Shop::getContext() == Shop::CONTEXT_GROUP) if (Shop::getContext() == Shop::CONTEXT_GROUP)
admin-dev/header.inc.php
+1 -1
View File
@@ -341,7 +341,7 @@ echo '
if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_) if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
echo '<div class="warn">This tab is an AdminTab</div>'; echo '<div class="warn">This tab is an AdminTab</div>';
if (Shop::isFeatureActive()) if (Shop::isFeatureActive() && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
{ {
echo '<div class="multishop_toolbar"> echo '<div class="multishop_toolbar">
<span class="text_multishop">'.translate('Multistore configuration for').'</span>'. <span class="text_multishop">'.translate('Multistore configuration for').'</span>'.