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

//tab module list fix

Browse Source
This commit is contained in:
Vincent Augagneur
2013-12-10 09:43:15 +01:00
parent 5b809ec536
commit fd1050b0db
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin-dev/themes/default/template/controllers/localization/content.tpl
View File

@@ -23,10 +23,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="width4">
{if isset($localization_form)}{$localization_form}{/if}
</div>
{if isset($localization_form)}{$localization_form}{/if}
<br />
<div class="width4">
{if isset($localization_options)}{$localization_options}{/if}
</div>
{if isset($localization_options)}{$localization_options}{/if}

2
classes/controller/AdminController.php
View File

@@ -1547,7 +1547,7 @@ class AdminControllerCore extends Controller
if (!empty($country_module_list) && is_string($country_module_list) && $country_module_list_xml = simplexml_load_string($country_module_list))
{
$country_module_list_array = array();
if (is_array($country_module_list_xml->module))
if (isset($country_module_list_xml->module))
foreach ($country_module_list_xml->module as $k => $m)
$country_module_list_array[] = (string)$m->name;
$this->tab_modules_list['slider_list'] = array_intersect($this->tab_modules_list['slider_list'], $country_module_list_array);

1
controllers/admin/AdminCmsCategoriesController.php
View File

@@ -71,6 +71,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
{
$this->initToolbar();
$this->toolbar_btn['new']['href'] .= '&amp;id_parent='.(int)Tools::getValue('id_cms_category');
$this->initTabModuleList();
return parent::renderList();
}

1
controllers/admin/AdminDeliverySlipController.php
View File

@@ -120,6 +120,7 @@ class AdminDeliverySlipControllerCore extends AdminController
public function initContent()
{
$this->initTabModuleList();
$this->content .= $this->renderForm().'<br />';
$this->show_toolbar = false;
$this->content .= $this->renderOptions();

11
controllers/admin/AdminLocalizationController.php
View File

@@ -304,7 +304,7 @@ class AdminLocalizationControllerCore extends AdminController
'download_updated_pack' => 1
);
$this->show_toolbar = false;
$this->show_toolbar = true;
return parent::renderForm();
}
@@ -315,7 +315,6 @@ class AdminLocalizationControllerCore extends AdminController
// toolbar (save, cancel, new, ..)
$this->initToolbar();
$this->context->smarty->assign(array(
'localization_form' => $this->renderForm(),
'localization_options' => $this->renderOptions(),
@@ -323,9 +322,15 @@ class AdminLocalizationControllerCore extends AdminController
));
}
public function initToolbar()
{
$this->toolbar_btn = array();
$this->initTabModuleList();
}
public function display()
{
$this->initContent();
$this->initContent();
parent::display();
}

1
controllers/admin/AdminManufacturersController.php
View File

@@ -638,6 +638,7 @@ class AdminManufacturersControllerCore extends AdminController
{
// toolbar (save, cancel, new, ..)
$this->initToolbar();
$this->initTabModuleList();
if ($this->display == 'editaddresses' || $this->display == 'addaddress')
$this->content .= $this->renderFormAddress();
else if ($this->display == 'edit' || $this->display == 'add')