Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix backoffice header toolbar buttons not visible on some pages

Browse Source
This commit is contained in:
Shreesh Arora
2023-04-04 13:15:50 +05:30
parent 2f3f616b95
commit cfe3bab2bc
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
classes/controller/AdminController.php
View File

@@ -1628,14 +1628,6 @@ class AdminControllerCore extends Controller
$this->context->smarty->assign('help_link', 'http://help.prestashop.com/'.Language::getIsoById($this->context->employee->id_lang).'/doc/'
.Tools::getValue('controller').'?version='._PS_VERSION_.'&country='.Language::getIsoById($this->context->employee->id_lang));
$this->context->smarty->assign(array(
'show_page_header_toolbar' => $this->show_page_header_toolbar,
'page_header_toolbar_title' => $this->page_header_toolbar_title,
'title' => $this->page_header_toolbar_title,
'toolbar_btn' => $this->page_header_toolbar_btn,
'page_header_toolbar_btn' => $this->page_header_toolbar_btn,
));
}
/**
@@ -2138,11 +2130,9 @@ class AdminControllerCore extends Controller
$this->initPageHeaderToolbar();
if ($this->display == 'edit' || $this->display == 'add') {
if (!$this->loadObject(true)) {
return;
if ($this->loadObject(true)) {
$this->content .= $this->renderForm();
}
$this->content .= $this->renderForm();
} elseif ($this->display == 'view') {
// Some controllers use the view action without an object
if ($this->className) {
@@ -2168,6 +2158,11 @@ class AdminControllerCore extends Controller
'content' => $this->content,
'lite_display' => $this->lite_display,
'url_post' => self::$currentIndex.'&token='.$this->token,
'show_page_header_toolbar' => $this->show_page_header_toolbar,
'page_header_toolbar_title' => $this->page_header_toolbar_title,
'title' => $this->page_header_toolbar_title,
'toolbar_btn' => $this->page_header_toolbar_btn,
'page_header_toolbar_btn' => $this->page_header_toolbar_btn,
));
}

4
controllers/admin/AdminEmployeesController.php
View File

@@ -175,6 +175,8 @@ class AdminEmployeesControllerCore extends AdminController
public function initPageHeaderToolbar()
{
parent::initPageHeaderToolbar();
if (empty($this->display)) {
$this->page_header_toolbar_btn['new_employee'] = array(
'href' => self::$currentIndex.'&addemployee&token='.$this->token,
@@ -193,8 +195,6 @@ class AdminEmployeesControllerCore extends AdminController
$this->toolbar_title);
}
}
parent::initPageHeaderToolbar();
}
public function renderList()

4
controllers/admin/AdminThemesController.php
View File

@@ -716,6 +716,8 @@ class AdminThemesControllerCore extends AdminController
public function initPageHeaderToolbar()
{
parent::initPageHeaderToolbar();
if (empty($this->display)) {
$this->page_header_toolbar_btn['import_theme'] = array(
'href' => self::$currentIndex.'&action=importtheme&token='.$this->token,
@@ -744,8 +746,6 @@ class AdminThemesControllerCore extends AdminController
$title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title);
$this->page_header_toolbar_title = $title;
parent::initPageHeaderToolbar();
}
private function checkParentClass($name)