// fix retrieving of the fields value 'shop' and 'group_shop' dynamically (PSFV-94)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10130 b9a71923-0436-4b27-9f14-aed3839534dd

admin-dev/themes/template/helper/form/form.tpl

@@ -108,7 +108,7 @@
 							{/if}
 						{/block}
 						{if $input.type == 'hidden'}
-							<input type="hidden" name="{$input.name}" value="{$fields_value[$input.name]}" />
+							<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]}" />
 						{else}
 						{block name="start_field_block"}
 							<div class="margin-form">
@@ -320,7 +320,7 @@
 						<input type="submit"
 							id="{$table}_form_submit_btn"
 							value="{$field.title}"
-							name="{$submit_action}{if isset($field.stay) && $field.stay}AndStay{/if}"
+							name="{if isset($field.name)}{$field.name}{else}{$submit_action}{/if}{if isset($field.stay) && $field.stay}AndStay{/if}"
 							{if isset($field.class)}class="{$field.class}"{/if} />
 					</div>
 				{elseif $key == 'p'}

admin-dev/themes/template/helper/form/form_category.tpl

@@ -51,8 +51,7 @@
 	</div>
 
 	{assign var=home_is_selected value=false}
-	
-	
+
 	{foreach $categories.selected_cat AS $cat}
 		{if is_array($cat)}
 			{if $cat.id_category != 1}

admin-dev/themes/template/helper/form/form_shop.tpl

@@ -74,11 +74,11 @@ function check_all_shop() {ldelim}
 <div class="assoShop">
 	<table class="table" cellpadding="0" cellspacing="0" width="100%">
 		<tr>
-			<th>{l s='Shop'}</th>
+			<th>{if $input.type == 'group_shop'}{l s='Group shop'}{else}{l s='Shop'}{/if}</th>
 		</tr>
 		<tr {if $input.type == 'group_shop'}class="alt_row"{/if}>
 			<td>
-				<label class="t"><input class="input_all_shop" type="checkbox" /> {l s='All shops'}</label>
+				<label class="t"><input class="input_all_shop" type="checkbox" /> {if $input.type == 'group_shop'}{l s='All group shops'}{else}{l s='All shops'}{/if}</label>
 			</td>
 		</tr>
 		{foreach $input.values as $groupID => $groupData}