From 508e5b9d339f79f8bd2afb83ee89c5b8d1a05019 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Wed, 2 Nov 2011 15:35:45 +0000
Subject: [PATCH] // fix bug position in AdminAttributesGroupsController
 (PSFV-94)

---
 .../template/attributes/list_content.tpl      |   2 +-
 .../attributes_groups/list_content.tpl        | 116 ++++++++++++++++++
 .../template/helper/list/list_content.tpl     |   2 +-
 3 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 admin-dev/themes/template/attributes_groups/list_content.tpl

diff --git a/admin-dev/themes/template/attributes/list_content.tpl b/admin-dev/themes/template/attributes/list_content.tpl
index 1e5364a21..80bc7fd8f 100644
--- a/admin-dev/themes/template/attributes/list_content.tpl
+++ b/admin-dev/themes/template/attributes/list_content.tpl
@@ -26,7 +26,7 @@
 <tbody>
 {foreach $list AS $index => $tr}
 	<tr
-	{if $is_dnd_identifier}id="tr_{$id_category}_{$tr.$identifier}_{$tr.position}"{/if}
+	{if $is_dnd_identifier}id="tr_{$id_category}_{$tr.$identifier}_{$tr.position['position']}"{/if}
 	{if $index is odd}class="alt_row"{/if}
 	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
 	>
diff --git a/admin-dev/themes/template/attributes_groups/list_content.tpl b/admin-dev/themes/template/attributes_groups/list_content.tpl
new file mode 100644
index 000000000..606f979f4
--- /dev/null
+++ b/admin-dev/themes/template/attributes_groups/list_content.tpl
@@ -0,0 +1,116 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 9608 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<tbody>
+{foreach $list AS $index => $tr}
+	<tr
+	{if $is_dnd_identifier}id="tr_{$tr.$identifier}_{$tr.position['position']}"{/if}
+	{if $index is odd}class="alt_row"{/if}
+	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
+	>
+		<td class="center">
+			{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}
+					<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
+				{/if}
+			{/if}
+		</td>
+		{foreach $fields_display AS $key => $params}
+			<td
+				{if isset($params.position)}
+					id="td_{if $id_category}{$id_category}{else}0{/if}_{$tr.$identifier}"
+				{/if}
+				class="{if !$no_link}pointer{/if}
+					   {if isset($params.position) && $order_by == 'position'} dragHandle{/if}
+					   {if isset($params.align)} {$params.align}{/if}"
+
+			{if (!isset($params.position) && !$no_link)}
+				onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">{if isset($params.prefix)}{$params.prefix}{/if}
+			{else}
+				>
+			{/if}
+			{if isset($params.active)}
+			    {$tr.$key}
+			{elseif isset($params.activeVisu)}
+				<img src="../img/admin/{if $tr.$key}enabled.gif{else}disabled.gif{/if}"
+				alt="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" title="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" />
+			{elseif isset($params.position)}
+				{if $order_by == 'position' && $order_way != 'DESC'}
+					<a href="{$tr.$key.position_url_down}" {if !($tr.$key.position != $positions[count($positions) - 1])}style="display: none;"{/if}>
+						<img src="../img/admin/{if $order_way == 'ASC'}down{else}up{/if}.gif" alt="{l s='Down'}" title="{l s='Down'}" />
+					</a>
+
+					<a href="{$tr.$key.position_url_up}" {if !($tr.$key.position != $positions.0)}style="display: none;"{/if}>
+						<img src="../img/admin/{if $order_way == 'ASC'}up{else}down{/if}.gif" alt="{l s='Up'}" title="{l s='Up'}" />
+					</a>
+				{else}
+					{$tr.$key.position + 1}
+				{/if}
+			{elseif isset($params.image)}
+				{$tr.$key}
+			{elseif (isset($params.icon))}
+				<img src="../img/admin/{$tr[$key]}" alt="{$tr[$key]}" title="{$tr[$key]}" />
+            {elseif isset($params.price)}
+				{$tr.$key}
+			{elseif isset($params.float)}
+				{$tr.$key}
+			{elseif isset($params.type) && $params.type == 'date'}
+				{$tr.$key}
+			{elseif isset($params.type) && $params.type == 'datetime'}
+				{$tr.$key}
+			{elseif isset($params.callback)}
+				{$tr.$key}
+			{elseif isset($tr.$key) && $key == 'color'}
+				<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
+			{elseif isset($tr.$key)}
+				{$tr.$key|escape:'htmlall':'UTF-8'}
+			{else}
+				--
+			{/if}
+			{if isset($params.suffix)}{$params.suffix}{/if}
+			</td>
+		{/foreach}
+
+	{if $shop_link_type}
+		<td class="center" {if $name != $tr.shop_name}title="{$tr.shop_name}"{/if}>{if isset($tr.shop_short_name)}{$tr.shop_short_name}{else}{$tr.shop_name}{/if}</td>
+	{/if}
+	{if $has_actions}
+		<td class="center" style="white-space: nowrap;">
+			{foreach $actions AS $action}
+				{if isset($tr.$action)}
+	            	{$tr.$action}
+	            {/if}
+			{/foreach}
+		</td>
+	{/if}
+	</tr>
+{/foreach}
+</tbody>
\ No newline at end of file
diff --git a/admin-dev/themes/template/helper/list/list_content.tpl b/admin-dev/themes/template/helper/list/list_content.tpl
index ba03efd70..76505d3e9 100644
--- a/admin-dev/themes/template/helper/list/list_content.tpl
+++ b/admin-dev/themes/template/helper/list/list_content.tpl
@@ -26,7 +26,7 @@
 <tbody>
 {foreach $list AS $index => $tr}
 	<tr
-	{if $is_dnd_identifier}id="tr_{$id_category}_{$tr.$identifier}_{$tr.position}"{/if}
+	{if $is_dnd_identifier}id="tr_{$id_category}_{$tr.$identifier}_{$tr.position['position']}"{/if}
 	{if $index is odd}class="alt_row"{/if}
 	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
 	>