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

// Fix missing page header in combinations generator

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-11-06 14:42:56 +01:00
1 parent fcb225ac5a
commit 7895f8643e
2 files changed
+10 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+1 -1
View File
@@ -61,7 +61,7 @@
$(document).ready(function() { $('.price_impact').each(function() { calcPrice($(this), false); }); }); $(document).ready(function() { $('.price_impact').each(function() { calcPrice($(this), false); }); });
</script> </script>
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title} {include file="page_header_toolbar.tpl" toolbar_btn=$page_header_toolbar_btn title=$page_header_toolbar_title}
<div class="leadin">{block name="leadin"}{/block}</div> <div class="leadin">{block name="leadin"}{/block}</div>
{if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if} {if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if}
controllers/admin/AdminAttributeGeneratorController.php
+9 -5
View File
@@ -196,9 +196,12 @@ class AdminAttributeGeneratorControllerCore extends AdminController
)); ));
} }
public function initToolbar() public function initPageHeaderToolbar()
{ {
$this->toolbar_btn['back'] = array( parent::initPageHeaderToolbar();
$this->page_header_toolbar_title = $this->l('Attributes generator');
$this->page_header_toolbar_btn['back'] = array(
'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations', 'href' => $this->context->link->getAdminLink('AdminProducts').'&id_product='.(int)Tools::getValue('id_product').'&addproduct&key_tab=Combinations',
'desc' => $this->l('Back to the product') 'desc' => $this->l('Back to the product')
); );
@@ -215,8 +218,7 @@ class AdminAttributeGeneratorControllerCore extends AdminController
} }
// Init toolbar // Init toolbar
$this->initToolbarTitle(); $this->initPageHeaderToolbar();
$this->initToolbar();
$this->initGroupTable(); $this->initGroupTable();
$attributes = Attribute::getAttributes(Context::getContext()->language->id, true); $attributes = Attribute::getAttributes(Context::getContext()->language->id, true);
@@ -239,7 +241,9 @@ class AdminAttributeGeneratorControllerCore extends AdminController
'attribute_js' => $attribute_js, 'attribute_js' => $attribute_js,
'toolbar_btn' => $this->toolbar_btn, 'toolbar_btn' => $this->toolbar_btn,
'toolbar_scroll' => true, 'toolbar_scroll' => true,
'title' => $this->toolbar_title, 'show_page_header_toolbar' => $this->show_page_header_toolbar,
'page_header_toolbar_title' => $this->page_header_toolbar_title,
'page_header_toolbar_btn' => $this->page_header_toolbar_btn
)); ));
} }
} }