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

// Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17065 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-08-29 09:55:39 +00:00
parent 07836fb3a0
commit 6fed7f3683
12 changed files with 79 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/admin-products.js
+4 -4
View File
@@ -419,12 +419,12 @@ function handleSaveButtons(e)
// common for all products
$("#disableSaveMessage").remove();
if ($("#name_"+defaultLanguage).val() == "" && (!display_multishop_checkboxes || $('input[name=\'multishop_check[name]['+defaultLanguage+']\']').prop('checked')))
if ($("#name_" + id_lang_default).val() == "" && (!display_multishop_checkboxes || $('input[name=\'multishop_check[name][' + id_lang_default + ']\']').prop('checked')))
{
msg[i++] = empty_name_msg;
}
// check friendly_url_[defaultlangid] only if name is ok
else if ($("#link_rewrite_"+defaultLanguage).val() == "" && (!display_multishop_checkboxes || $('input[name=\'link_rewrite[name]['+defaultLanguage+']\']').prop('checked')))
else if ($("#link_rewrite_" + id_lang_default).val() == "" && (!display_multishop_checkboxes || $('input[name=\'link_rewrite[name][' + id_lang_default + ']\']').prop('checked')))
msg[i++] = empty_link_rewrite_msg;
if (msg.length == 0)
@@ -1577,7 +1577,7 @@ $(document).ready(function() {
updateCurrentText();
$("#name_"+defaultLanguage+",#link_rewrite_"+defaultLanguage)
$("#name_" + id_lang_default + ",#link_rewrite_" + id_lang_default)
.live("change", function(e)
{
if(typeof e == KeyboardEvent)
@@ -1586,7 +1586,7 @@ $(document).ready(function() {
$(this).trigger("handleSaveButtons");
});
// bind that custom event
$("#name_"+defaultLanguage+",#link_rewrite_"+defaultLanguage)
$("#name_" + id_lang_default + ",#link_rewrite_" + id_lang_default)
.live("handleSaveButtons", function(e)
{
handleSaveButtons()