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

// fix delete var no_back and multiple call method initToolbarTitle

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10277 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-18 16:05:46 +00:00
parent fd90a0313d
commit 1bf46b362c
5 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+7 -20
View File
@@ -880,17 +880,14 @@ class AdminControllerCore extends Controller
//no break
case 'view':
// Default cancel button - like old back link
if (!isset($this->no_back) || $this->no_back == false)
{
$back = Tools::safeOutput(Tools::getValue('back', ''));
if (empty($back))
$back = self::$currentIndex.'&token='.$this->token;
$back = Tools::safeOutput(Tools::getValue('back', ''));
if (empty($back))
$back = self::$currentIndex.'&token='.$this->token;
$this->toolbar_btn['cancel'] = array(
'href' => $back,
'desc' => $this->l('Cancel')
);
}
$this->toolbar_btn['cancel'] = array(
'href' => $back,
'desc' => $this->l('Cancel')
);
break;
case 'options':
$this->toolbar_btn['save'] = array(
@@ -1327,9 +1324,6 @@ class AdminControllerCore extends Controller
*/
public function initView()
{
if (empty($this->toolbar_title))
$this->initToolbarTitle();
$helper = new HelperView($this);
$this->setHelperDisplay($helper);
$helper->tpl_vars = $this->tpl_view_vars;
@@ -1351,9 +1345,6 @@ class AdminControllerCore extends Controller
if (!$this->multiple_fieldsets)
$this->fields_form = array(array('form' => $this->fields_form));
if (empty($this->toolbar_title))
$this->initToolbarTitle();
$this->getlanguages();
$helper = new HelperForm($this);
$this->setHelperDisplay($helper);
@@ -1380,9 +1371,6 @@ class AdminControllerCore extends Controller
{
if ($this->options && is_array($this->options))
{
if (empty($this->toolbar_title))
$this->initToolbarTitle();
if ($this->display != 'options')
$this->show_toolbar = false;
@@ -1435,7 +1423,6 @@ class AdminControllerCore extends Controller
$helper->imageType = $this->imageType;
$helper->no_link = $this->list_no_link;
$helper->colorOnBackground = $this->colorOnBackground;
$helper->no_back = isset($this->no_back) ? $this->no_back : true;
$helper->ajax_params = (isset($this->ajax_params) ? $this->ajax_params : null);
$helper->default_form_language = $this->default_form_language;
$helper->allow_employee_form_lang = $this->allow_employee_form_lang;