dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix display issue with required fields #PSTEST-343

Browse Source
This commit is contained in:
tDidierjean
2012-01-06 10:01:06 +00:00
parent 50497a0395
commit 47ff5b1696
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helper/options/options.tpl
+2 -2
View File
@@ -183,7 +183,7 @@
</label> </label>
</div> </div>
{/if} {/if}
{if (isset($field['required']) && $field['required'])} {if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}
<sup>*</sup> <sup>*</sup>
{/if} {/if}
{if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if} {if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if}
@@ -202,7 +202,7 @@
/> />
</div> </div>
{/if} {/if}
{if $required_fields} {if isset($categoryData['required_fields']) && $categoryData['required_fields']}
<div class="small"><sup>*</sup> {l s='Required field'}</div> <div class="small"><sup>*</sup> {l s='Required field'}</div>
{/if} {/if}
{if isset($categoryData['bottom'])}{$categoryData['bottom']}{/if} {if isset($categoryData['bottom'])}{$categoryData['bottom']}{/if}
classes/helper/HelperOptions.php
+1 -3
View File
@@ -133,8 +133,7 @@ class HelperOptionsCore extends Helper
// Is at least one required field present? // Is at least one required field present?
if (isset($field['required']) && $field['required']) if (isset($field['required']) && $field['required'])
$required_fields = true; $category_data['required_fields'] = true;
} }
// Assign the modifications back to parent array // Assign the modifications back to parent array
$option_list[$category] = $category_data; $option_list[$category] = $category_data;
@@ -150,7 +149,6 @@ class HelperOptionsCore extends Helper
'token' => $this->token, 'token' => $this->token,
'option_list' => $option_list, 'option_list' => $option_list,
'current_id_lang' => $this->context->language->id, 'current_id_lang' => $this->context->language->id,
'required_fields' => isset($required_fields) ? $required_fields : false,
'languages' => isset($languages) ? $languages : null, 'languages' => isset($languages) ? $languages : null,
'currency_left_sign' => $this->context->currency->getSign('left'), 'currency_left_sign' => $this->context->currency->getSign('left'),
'currency_right_sign' => $this->context->currency->getSign('right'), 'currency_right_sign' => $this->context->currency->getSign('right'),