From 810c344dc2a943f42b2d21c2dcff9a8f996812ba Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Thu, 29 Dec 2011 17:01:33 +0000
Subject: [PATCH] [*] BO : HelperForm now handles input type=select with
 collection

---
 .../default/template/helper/form/form.tpl     | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/admin-dev/themes/default/template/helper/form/form.tpl b/admin-dev/themes/default/template/helper/form/form.tpl
index 10fd735f7..4dbdc7eef 100644
--- a/admin-dev/themes/default/template/helper/form/form.tpl
+++ b/admin-dev/themes/default/template/helper/form/form.tpl
@@ -163,15 +163,28 @@
 											{/foreach}
 										{else}
 											{foreach $input.options.query AS $option}
-												<option value="{$option[$input.options.id]}"
-													{if isset($input.multiple)}
-														{foreach $fields_value[$input.name] as $field_value}
-															{if $field_value == $option[$input.options.id]}selected="selected"{/if}
-														{/foreach}
-													{else}
-														{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}
-													{/if}
-												>{$option[$input.options.name]}</option>
+												{if is_object($option)}
+													<option value="{$option->$input.options.id}"
+														{if isset($input.multiple)}
+															{foreach $fields_value[$input.name] as $field_value}
+																{if $field_value == $option->$input.options.id}selected="selected"{/if}
+															{/foreach}
+														{else}
+															{if $fields_value[$input.name] == $option->$input.options.id}selected="selected"{/if}
+														{/if}
+													>{$option->$input.options.name}</option>
+												{else}
+													<option value="{$option[$input.options.id]}"
+														{if isset($input.multiple)}
+															{foreach $fields_value[$input.name] as $field_value}
+																{if $field_value == $option[$input.options.id]}selected="selected"{/if}
+															{/foreach}
+														{else}
+															{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}
+														{/if}
+													>{$option[$input.options.name]}</option>
+
+												{/if}
 											{/foreach}
 										{/if}
 									</select>