From 73e9d966a6ac0f00bc3922b242e9eeca02e6b1a8 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Tue, 22 Oct 2013 11:24:50 +0200
Subject: [PATCH] // list bulk actions fix

---
 .../themes/default/template/helpers/list/list_content.tpl   | 2 +-
 .../themes/default/template/helpers/list/list_footer.tpl    | 2 +-
 classes/helper/HelperList.php                               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index ea0d5725e..91e235809 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -31,7 +31,7 @@
 	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
 	>
 		<td class="center">
-			{if {$has_bulk_actions}}
+			{if $bulk_actions && $has_bulk_actions}
 				{if isset($list_skip_actions.delete)}
 					{if !in_array($tr.$identifier, $list_skip_actions.delete)}
 						<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
index 8638b7f6d..e89180e02 100644
--- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -26,7 +26,7 @@
 </div>
 <div class="row">
 	<div class="col-lg-8">
-		{if $bulk_actions}
+		{if $bulk_actions && $has_bulk_actions}
 		<div class="btn-group bulk-actions">
 			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 				{l s='Bulk actions'} <span class="caret"></span>
diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php
index 84023cbba..05daa0f60 100644
--- a/classes/helper/HelperList.php
+++ b/classes/helper/HelperList.php
@@ -334,7 +334,7 @@ class HelperListCore extends Helper
 			'view' => in_array('view', $this->actions),
 			'edit' => in_array('edit', $this->actions),
 			'has_actions' => !empty($this->actions),
-			'has_bulk_actions' => !empty($this->bulk_actions),
+			'has_bulk_actions' =>  count($this->_list) <= 1 ? false : !empty($this->bulk_actions),
 			'list_skip_actions' => $this->list_skip_actions,
 			'row_hover' => $this->row_hover,
 		)));
@@ -605,10 +605,11 @@ 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' => $this->bulk_actions,
 			'show_toolbar' => $this->show_toolbar,
 			'toolbar_scroll' => $this->toolbar_scroll,
 			'toolbar_btn' => $this->toolbar_btn,
+			'has_bulk_actions' => (count($this->_list) <= 1 && !$has_value) ? false : !empty($this->bulk_actions),
 		));
 
 		$this->header_tpl->assign(array_merge($this->tpl_vars, array(
@@ -626,7 +627,6 @@ class HelperListCore extends Helper
 			'id_cat' => $id_cat,
 			'shop_link_type' => $this->shopLinkType,
 			'has_actions' => !empty($this->actions),
-			'has_bulk_actions' => (count($this->_list) <= 1 && !$has_value) ? false : !empty($this->bulk_actions),
 			'table_id' => isset($table_id) ? $table_id : null,
 			'table_dnd' => isset($table_dnd) ? $table_dnd : null,
 			'name' => isset($name) ? $name : null,