From 64b9047b6d59986f2fd8fb9bee724b04c382179d Mon Sep 17 00:00:00 2001 From: lLefevre Date: Wed, 19 Oct 2011 09:17:56 +0000 Subject: [PATCH] //Fixed bug var list_skip_actions in list_content.tpl --- admin-dev/themes/template/list_content.tpl | 12 ++++++++++-- controllers/admin/AdminShopUrlController.php | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/admin-dev/themes/template/list_content.tpl b/admin-dev/themes/template/list_content.tpl index 50c6758eb..bc8044151 100644 --- a/admin-dev/themes/template/list_content.tpl +++ b/admin-dev/themes/template/list_content.tpl @@ -31,8 +31,16 @@ {if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if} > - {if $bulk_actions AND array_key_exists('delete', $list_skip_actions) AND !in_array($tr.$identifier, $list_skip_actions['delete'])} - + {if $bulk_actions} + {assign var=bulkActionPossible value=true} + {foreach $list_skip_actions as $key => $value} + {if in_array($tr.$identifier, $value) == true} + {assign var=bulkActionPossible value=false} + {/if} + {/foreach} + {if $bulkActionPossible == true} + + {/if} {/if} {foreach $fields_display AS $key => $params} diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index 714514f09..8e36ebaf1 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -33,7 +33,7 @@ class AdminShopUrlControllerCore extends AdminController $this->className = 'ShopUrl'; $this->lang = false; $this->requiredDatabase = true; - $this->_listSkipDelete = array(1); + $this->addRowActionSkipList('delete', array(1)); $this->addRowAction('edit'); $this->addRowAction('delete');