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

// #PSFV-94 - fixed bug related to new breadcrumb system

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9881 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-11-04 10:59:10 +00:00
parent a1c8dec437
commit 845d741024
8 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCategoriesController.php
+4 -3
View File
@@ -103,8 +103,9 @@ class AdminCategoriesControllerCore extends AdminController
$categories_tree = $this->_category->getParentsCategories($this->context->language->id);
asort($categories_tree);
$this->context->smarty->assign('categories_name', stripslashes($this->_category->getName()));
$this->context->smarty->assign('categories_tree', $categories_tree);
$categories_name = stripslashes($this->_category->getName());
$this->tpl_list_vars['categories_tree'] = $categories_tree;
$this->tpl_list_vars['categories_name'] = $categories_name;
return parent::initList();
}
@@ -129,7 +130,7 @@ class AdminCategoriesControllerCore extends AdminController
public function initToolbar()
{
$this->toolbar_title = stripslashes($this->_category->getName());
// $this->toolbar_title = stripslashes($this->_category->getName());
if (empty($this->display))
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token,
controllers/admin/AdminManufacturersController.php
+1 -2
View File
@@ -88,7 +88,6 @@ class AdminManufacturersControllerCore extends AdminController
public function initListManufacturer()
{
$this->toolbar_title = $this->l('List of manufacturers:');
$this->addRowAction('view');
$this->addRowAction('edit');
$this->addRowAction('delete');
@@ -113,7 +112,7 @@ class AdminManufacturersControllerCore extends AdminController
{
$this->toolbar_title = $this->l('Manufacturers addresses:');
$this->toolbar_title = $this->l('Addresses');
// reset actions and query vars
$this->actions = array();
unset($this->fieldsDisplay, $this->_select, $this->_join, $this->_group, $this->_filterHaving, $this->_filter);
controllers/admin/AdminSearchController.php
+2
View File
@@ -201,6 +201,7 @@ class AdminSearchControllerCore extends AdminController
protected function initProductList()
{
$this->show_toolbar = false;
$this->fieldsDisplay['products'] = (array(
'id_product' => array('title' => $this->l('ID')),
'manufacturer_name' => array('title' => $this->l('Manufacturer'), 'align' => 'center'),
@@ -245,6 +246,7 @@ class AdminSearchControllerCore extends AdminController
$this->initProductList();
$helper->identifier = 'id_product';
$helper->actions = array('edit', 'view');
$helper->show_toolbar = false;
if ($this->_list['products'])
$view = $helper->generateList($this->_list['products'], $this->fieldsDisplay['products']);
$this->context->smarty->assign('products', $view);