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

// Fix multishop checkbox on theme selection

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15423 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-05-19 10:43:01 +00:00
parent 6230b51db1
commit 5781694b9f
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin-dev/themes/default/template/helpers/options/options.tpl
View File

@@ -58,7 +58,7 @@
<p>{$categoryData['info']}</p>
{/if}
{if $use_multishop}
{if !$categoryData['hide_multishop_checkbox'] && $use_multishop}
<input type="checkbox" style="vertical-align: text-top" onclick="checkAllMultishopDefaultValue(this)" /> <b>{l s='Check / uncheck all'}</b> {l s='(check boxes if you want to set a custom value for this shop or group shop context)'}
<div class="separation"></div>
{/if}
@@ -68,7 +68,7 @@
<input type="hidden" name="{$key}" value="{$field['value']}" />
{else}
<div style="clear: both; padding-top:15px;" id="conf_id_{$key}" {if $field['is_invisible']} class="isInvisible"{/if}>
{if ($field['multishop_default'])}
{if $field['multishop_default'] && empty($field['no_multishop_checkbox'])}
<div class="preference_default_multishop">
<input type="checkbox" name="multishopOverrideOption[{$key}]" value="1" {if !$field['is_disabled']}checked="checked"{/if} onclick="checkMultishopDefaultValue(this, '{$key}')" />
</div>

1
cache/class_index.php vendored
View File

@@ -510,7 +510,6 @@
'ProfileCore' => 'classes/Profile.php',
'QuickAccess' => 'override/classes/QuickAccess.php',
'QuickAccessCore' => 'classes/QuickAccess.php',
'Range' => 'override/classes/range/Range.php',
'RangePrice' => 'override/classes/range/RangePrice.php',
'RangePriceCore' => 'classes/range/RangePrice.php',
'RangeWeight' => 'override/classes/range/RangeWeight.php',

4
classes/helper/HelperOptions.php
View File

@@ -63,8 +63,12 @@ class HelperOptionsCore extends Helper
if (!isset($category_data['fields']))
$category_data['fields'] = array();
$category_data['hide_multishop_checkbox'] = true;
foreach ($category_data['fields'] as $key => $field)
{
if (empty($field['no_multishop_checkbox']))
$category_data['hide_multishop_checkbox'] = false;
// Set field value unless explicitly denied
if (!isset($field['auto_value']) || $field['auto_value'])
$field['value'] = $this->getOptionValue($key, $field);

1
controllers/admin/AdminThemesController.php
View File

@@ -109,6 +109,7 @@ class AdminThemesControllerCore extends AdminController
'themes' => Theme::getThemes(),
'id_theme' => $this->context->shop->id_theme,
'can_display_themes' => $this->can_display_themes,
'no_multishop_checkbox' => true,
),
),
),