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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Vincent Augagneur
2013-10-21 14:51:25 +02:00
parent 150c6e0130 7fbf6c7de0
commit 10473e09ad
9 changed files with 170 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/HelperList.php
+4 -4
View File
@@ -605,16 +605,16 @@ class HelperListCore extends Helper
'list_total' => $this->listTotal,
'token' => $this->token,
'table' => $this->table,
'bulk_actions' => (count($this->_list) <= 1 && !$has_value) ? array() : $this->bulk_actions
'bulk_actions' => (count($this->_list) <= 1 && !$has_value) ? array() : $this->bulk_actions,
'show_toolbar' => $this->show_toolbar,
'toolbar_scroll' => $this->toolbar_scroll,
'toolbar_btn' => $this->toolbar_btn,
));
$this->header_tpl->assign(array_merge($this->tpl_vars, array(
'title' => array_key_exists('title', $this->tpl_vars) ? $this->tpl_vars['title'] : $this->title,
'show_filters' => (count($this->_list) <= 1 && !$has_value) ? false : true,
'filters_has_value' => $has_value,
'show_toolbar' => $this->show_toolbar,
'toolbar_scroll' => $this->toolbar_scroll,
'toolbar_btn' => $this->toolbar_btn,
'currentIndex' => $this->currentIndex,
'action' => $action,
'is_order_position' => $this->position_identifier && $this->orderBy == 'position',