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

// fix in product page edition after deleting pack and save, some javascript function were not loaded

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13481 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2012-02-20 17:32:54 +00:00
parent 609a45f25b
commit 1b91c7da2a
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+5 -3
View File
@@ -79,21 +79,23 @@
<script type="text/javascript"> <script type="text/javascript">
var token = '{$token}'; var token = '{$token}';
var id_product = {if isset($product->id)}{$product->id}{else}0{/if}; var id_product = {if isset($product->id)}{$product->id}{else}0{/if};
var defaultLanguage = {$defaultLanguage};
var product_type_pack = {Product::PTYPE_PACK}; var product_type_pack = {Product::PTYPE_PACK};
var product_type_virtual = {Product::PTYPE_VIRTUAL}; var product_type_virtual = {Product::PTYPE_VIRTUAL};
var product_type_simple = {Product::PTYPE_SIMPLE}; var product_type_simple = {Product::PTYPE_SIMPLE};
var toload = new Array(); var toload = new Array();
var empty_pack_msg = '{l s='Pack is empty. You need to add at least one product to the pack before you can save it.'}'; var empty_pack_msg = '{l s='Pack is empty. You need to add at least one product to the pack before you can save it.' slashes=1}';
var empty_name_msg = '{l s='Product name is empty. You need to enter a name at least for the default language before you can save it.'}'; var empty_name_msg = '{l s='Product name is empty. You need to enter a name at least for the default language before you can save it.' slashes=1}';
var empty_link_rewrite_msg = '{l s='Friendly URL is empty. You need to enter a friendly url at least for the default language before you can save it.'}'; var empty_link_rewrite_msg = '{l s='Friendly URL is empty. You need to enter a friendly url at least for the default language before you can save it.' slashes=1}';
$('#product-tab-content-wait').show(); $('#product-tab-content-wait').show();
var post_data = {$post_data}; var post_data = {$post_data};
var product_type; var product_type;
$(document).ready(function() $(document).ready(function()
{ {
product_type = $("input[name=type_product]:checked").val();
$('#product-tab-content-wait').show(); $('#product-tab-content-wait').show();
{if $is_pack} {if $is_pack}
$('#pack_product').attr('checked', 'checked'); $('#pack_product').attr('checked', 'checked');
controllers/admin/AdminProductsController.php
+1
View File
@@ -2101,6 +2101,7 @@ class AdminProductsControllerCore extends AdminController
$this->getLanguages(); $this->getLanguages();
$languages = $this->_languages; $languages = $this->_languages;
$default_language = (int)Configuration::get('PS_LANG_DEFAULT'); $default_language = (int)Configuration::get('PS_LANG_DEFAULT');
$this->tpl_form_vars['defaultLanguage'] = Language::getLanguage($default_language);
$this->tpl_form_vars['currentIndex'] = self::$currentIndex; $this->tpl_form_vars['currentIndex'] = self::$currentIndex;
$this->fields_form = array(''); $this->fields_form = array('');
js/admin-products.js
+3 -2
View File
@@ -316,6 +316,7 @@ function enableSave()
function handleSaveButtons(e) function handleSaveButtons(e)
{ {
product_type = $("input[name=type_product]:checked").val();
msg = []; msg = [];
var i = 0; var i = 0;
// relative to type of product // relative to type of product
@@ -333,8 +334,8 @@ function handleSaveButtons(e)
{ {
msg[i++] = empty_name_msg; msg[i++] = empty_name_msg;
} }
// friendly_url_[defaultlangid] // check friendly_url_[defaultlangid] only if name is ok
if ($("#link_rewrite_"+defaultLanguage.id_lang).val() == "") else if ($("#link_rewrite_"+defaultLanguage.id_lang).val() == "")
msg[i++] = empty_link_rewrite_msg; msg[i++] = empty_link_rewrite_msg;
if (msg.length == 0) if (msg.length == 0)