Skip to content

Commit

Permalink
Merge pull request #396 from abhishek-webkul/gli-823
Browse files Browse the repository at this point in the history
Fix page header issues when accessing unavailable objects on admin controller
  • Loading branch information
rohit053 authored Sep 23, 2022
2 parents acc32c0 + 405d3e1 commit 1fe14dd
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions classes/controller/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1579,6 +1579,14 @@ public function initPageHeaderToolbar()

$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,
));
}

/**
Expand Down Expand Up @@ -2112,11 +2120,6 @@ public function initContent()
'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
));
}

Expand Down

0 comments on commit 1fe14dd

Please sign in to comment.