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

// Fix upgrade and dashboard

Browse Source
This commit is contained in:
Damien Metzger
2013-10-11 14:06:49 +02:00
parent cd5a308ad7
commit 809eac6308
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/functions.php
+2 -2
View File
@@ -411,8 +411,8 @@ function runAdminTab($tab, $ajaxMode = false)
$cookie = Context::getContext()->cookie;
if (empty($tab) && !sizeof($_POST))
{
$tab = 'AdminHome';
$_POST['tab'] = 'AdminHome';
$tab = 'AdminDashboard';
$_POST['tab'] = $tab;
$_POST['token'] = Tools::getAdminTokenLite($tab);
}
// $tab = $_REQUEST['tab'];
classes/controller/AdminController.php
+2 -2
View File
@@ -334,7 +334,7 @@ class AdminControllerCore extends Controller
if (!$this->_defaultOrderBy) $this->_defaultOrderBy = $this->identifier;
$this->tabAccess = Profile::getProfileAccess($this->context->employee->id_profile, $this->id);
// Fix for AdminHome
// Fix for homepage
if ($this->controller_name == 'AdminDashboard')
$_POST['token'] = $this->token;
@@ -1284,7 +1284,7 @@ class AdminControllerCore extends Controller
if (false === strpos($url, '?token=') && false === strpos($url, '&token='))
$url .= '&token='.$this->token;
if (strpos($url, '?') === false)
$url = str_replace('&token', '?controller=AdminHome&token', $url);
$url = str_replace('&token', '?controller=AdminDashboard&token', $url);
$this->context->smarty->assign('url', htmlentities($url));
return false;
controllers/admin/AdminEmailsController.php
+1 -1
View File
@@ -184,7 +184,7 @@ class AdminEmailsControllerCore extends AdminController
$this->initPageHeaderToolbar();
$this->addToolBarModulesListButton();
unset($this->toolbar_btn['save']);
$back = $this->context->link->getAdminLink('AdminHome');
$back = $this->context->link->getAdminLink('AdminDashboard');
$this->toolbar_btn['back'] = array(
'href' => $back,
controllers/admin/AdminEmployeesController.php
+1 -1
View File
@@ -113,7 +113,7 @@ class AdminEmployeesControllerCore extends AdminController
if ($theme[0] != '.' && is_dir($path.$theme) && (file_exists($path.$theme.'/css/admin.css') || file_exists($path.$theme.'/css/admin-theme.css')))
$this->themes[] = $theme;
$home_tab = Tab::getInstanceFromClassName('adminHome');
$home_tab = Tab::getInstanceFromClassName('AdminDashboard');
$this->tabs_list[$home_tab->id] = array(
'name' => $home_tab->name[$this->context->language->id],
'id_tab' => $home_tab->id,
install-dev/upgrade/sql/1.6.0.1.sql
+2
View File
@@ -31,3 +31,5 @@ CREATE TABLE `PREFIX_configuration_kpi_lang` (
/* PHP:ps1600_add_missing_index(); */;
UPDATE `PREFIX_configuration` SET `value`='-' WHERE `name` = 'PS_ATTRIBUTE_ANCHOR_SEPARATOR';
UPDATE `PREFIX_tab` SET class_name = 'AdminDashboard' WHERE class_name = 'AdminHome';