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

[*] BO : fix update javascript because radio button shared stocks deleted, fix error in automatic replacement

Browse Source
This commit is contained in:
hAitmansour
2011-10-27 09:41:20 +00:00
parent 59b1b86e09
commit 2d3ff4abfc
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/group_shop/form.tpl
+17 -17
View File
@@ -1,5 +1,5 @@
{* {*
* 2007-2011 PrestaShop * 2007-2011 PrestaShop
* *
* NOTICE OF LICENSE * NOTICE OF LICENSE
* *
@@ -28,7 +28,7 @@
<script type="text/javascript"> <script type="text/javascript">
var vat_number = {$vat_number}; var vat_number = {$vat_number};
var module_dir = '{$module_dir}'; var module_dir = '{$module_dir}';
$(document).ready(function() {ldelim} $(document).ready(function() {ldelim}
var id_language = {$defaultFormLanguage}; var id_language = {$defaultFormLanguage};
var languages = new Array(); var languages = new Array();
@@ -40,11 +40,11 @@
{rdelim}; {rdelim};
{/foreach} {/foreach}
displayFlags(languages, id_language, {$allowEmployeeFormLang}); displayFlags(languages, id_language, {$allowEmployeeFormLang});
$('input[name=share_order]').attr('disabled', true); $('input[name=share_order]').attr('disabled', true);
$('input[name=share_customer], input[name=share_stock]').click(function() $('input[name=share_customer]').click(function()
{ {
var disabled = ($('input[name=share_customer]').attr('checked') && $('input[name=share_stock]').attr('checked')) ? false : true; var disabled = ($('input[name=share_customer]').attr('checked')) ? false : true;
$('input[name=share_order]').attr('disabled', disabled); $('input[name=share_order]').attr('disabled', disabled);
if (disabled) if (disabled)
$('#share_order_off').attr('checked', true); $('#share_order_off').attr('checked', true);
@@ -78,13 +78,13 @@
<label>{$input.label} </label> <label>{$input.label} </label>
<div class="margin-form"> <div class="margin-form">
{if $input.type == 'text'} {if $input.type == 'text'}
<input type="text" <input type="text"
name="{$input.name}" name="{$input.name}"
id="{$input.name}" id="{$input.name}"
value="{$fields_value[$input.name]}" value="{$fields_value[$input.name]}"
{if isset($input.size)}size="{$input.size}"{/if} {if isset($input.size)}size="{$input.size}"{/if}
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if} {if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
{if isset($input.class)}class="{$input.class}"{/if} {if isset($input.class)}class="{$input.class}"{/if}
{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} /> {if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} />
{elseif $input.type == 'select'} {elseif $input.type == 'select'}
<select name="{$input.name}" id="{$input.name}" {if isset($input.onchange)}onchange="{$input.onchange}"{/if}> <select name="{$input.name}" id="{$input.name}" {if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
@@ -92,24 +92,24 @@
{foreach $input.options.optiongroup.query AS $optiongroup} {foreach $input.options.optiongroup.query AS $optiongroup}
<optgroup label="{$optiongroup[$input.options.optiongroup.label]}"> <optgroup label="{$optiongroup[$input.options.optiongroup.label]}">
{foreach $optiongroup[$input.options.options.query] as $option} {foreach $optiongroup[$input.options.options.query] as $option}
<option value="{$option[$input.options.options.id]}" <option value="{$option[$input.options.options.id]}"
{if $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}>{$option[$input.options.options.name]}</option> {if $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}>{$option[$input.options.options.name]}</option>
{/foreach} {/foreach}
</optgroup> </optgroup>
{/foreach} {/foreach}
{else} {else}
{foreach $input.options.query AS $option} {foreach $input.options.query AS $option}
<option value="{$option[$input.options.id]}" <option value="{$option[$input.options.id]}"
{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}>{$option[$input.options.name]}</option> {if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}>{$option[$input.options.name]}</option>
{/foreach} {/foreach}
{/if} {/if}
</select> </select>
{elseif $input.type == 'radio'} {elseif $input.type == 'radio'}
{foreach $input.values as $value} {foreach $input.values as $value}
<input type="radio" <input type="radio"
name="{$input.name}" name="{$input.name}"
id="{$value.id}" id="{$value.id}"
value="{$value.value}" value="{$value.value}"
{if $disabled[$input.name]}disabled="disabled"{/if} {if $disabled[$input.name]}disabled="disabled"{/if}
{if $fields_value[$input.name] == $value.value}checked="checked"{/if} /> {if $fields_value[$input.name] == $value.value}checked="checked"{/if} />
<label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}"> <label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}">
@@ -127,7 +127,7 @@
{elseif $input.type == 'textarea'} {elseif $input.type == 'textarea'}
<textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]}</textarea> <textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]}</textarea>
{elseif $input.type == 'checkbox'} {elseif $input.type == 'checkbox'}
{/if} {/if}
{if isset($input.required) && $input.required} <sup>*</sup>{/if} {if isset($input.required) && $input.required} <sup>*</sup>{/if}
{if isset($input.p)} {if isset($input.p)}
controllers/admin/AdminGroupShopController.php
+1 -1
View File
@@ -150,7 +150,7 @@ class AdminGroupShopControllerCore extends AdminController
'defaultGroup' => Shop::getInstance(Configuration::get('PS_SHOP_DEFAULT'))->getGroupID() 'defaultGroup' => Shop::getInstance(Configuration::get('PS_SHOP_DEFAULT'))->getGroupID()
)); ));
return parent::initForm(); $this->content .= parent::initForm()
$import_data = array( $import_data = array(
'attribute_group' => $this->l('Attribute groups'), 'attribute_group' => $this->l('Attribute groups'),