diff --git a/admin-dev/themes/template/helper/list/list_header.tpl b/admin-dev/themes/template/helper/list/list_header.tpl index ea168410d..04ba16dfb 100644 --- a/admin-dev/themes/template/helper/list/list_header.tpl +++ b/admin-dev/themes/template/helper/list/list_header.tpl @@ -55,16 +55,17 @@ }); }); + + {if $show_toolbar} +
+

{block name=pageTitle} + {$page_title|default:' '} + {/block}

+
+ {include file="toolbar.tpl" toolbar_btn=$toolbar_btn} + {/if} + {/if}{* End if simple_header *} - -{if $show_toolbar} -
-

{block name=pageTitle} - {$page_title|default:' '} - {/block}

-
- {include file="toolbar.tpl" toolbar_btn=$toolbar_btn} -{/if}   @@ -112,7 +113,7 @@ {foreach $fields_display AS $key => $params} - {/foreach} + {/foreach} {if $shop_link_type} {/if} diff --git a/classes/AdminController.php b/classes/AdminController.php index ed976550f..c0d1314f6 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -1188,8 +1188,8 @@ class AdminControllerCore extends Controller * @return void */ public function setHelperListDisplay(Helper $helper) - { - // @todo : move that in Helper + { + // @todo : move that in Helper $helper->actions = $this->actions; $helper->simple_header = $this->list_simple_header; $helper->title = $this->toolbar_title; diff --git a/classes/HelperList.php b/classes/HelperList.php index a5f715f34..b45426411 100644 --- a/classes/HelperList.php +++ b/classes/HelperList.php @@ -347,8 +347,8 @@ class HelperListCore extends Helper 'current_index' => $this->currentIndex, 'view' => in_array('view', $this->actions), 'edit' => in_array('edit', $this->actions), - 'has_actions' => (bool)count($this->actions), - 'has_bulk_actions' => (bool)count($this->bulk_actions), + 'has_actions' => !empty($this->actions), + 'has_bulk_actions' => !empty($this->bulk_actions), 'list_skip_actions' => $this->list_skip_actions, )); return $this->content_tpl->fetch(); @@ -591,8 +591,8 @@ class HelperListCore extends Helper 'identifier' => $this->identifier, 'id_cat' => $id_cat, 'shop_link_type' => $this->shopLinkType, - 'has_actions' => (bool)count($this->actions), - 'has_bulk_actions' => (bool)count($this->bulk_actions), + 'has_actions' => !empty($this->actions), + 'has_bulk_actions' => !empty($this->bulk_actions), 'toolbar_btn' => $this->toolbar_btn, 'table_id' => isset($table_id) ? $table_id : null, 'table_dnd' => isset($table_dnd) ? $table_dnd : null, diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php index 308bbeca0..46a1d06a7 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -199,6 +199,7 @@ class AdminStockMvtControllerCore extends AdminController $this->table = 'stock_mvt'; $this->className = 'StockMvt'; $this->identifier = 'id_stock_mvt'; + $this->show_toolbar = false; $this->lang = false; // test if a filter is applied for this list