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

// Improve ajax request in new installer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11822 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-12-28 09:57:53 +00:00
parent a28b092c88
commit 939615b3ef
1 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-new/theme/js/database.js
+38 -15
View File
@@ -6,12 +6,15 @@ $(document).ready(function()
$("#dbResultCheck").slideUp('slow'); $("#dbResultCheck").slideUp('slow');
$.ajax({ $.ajax({
url: 'index.php', url: 'index.php',
data: 'checkDb=true&dbServer='+$('#dbServer').val() data: {
+'&dbName='+$('#dbName').val() 'checkDb': 'true',
+'&dbLogin='+$('#dbLogin').val() 'dbServer': $('#dbServer').val(),
+'&dbPassword='+$('#dbPassword').val() 'dbName': $('#dbName').val(),
+'&dbEngine='+$('#dbEngine').val() 'dbLogin': $('#dbLogin').val(),
+'&db_prefix='+$('#db_prefix').val(), 'dbPassword': $('#dbPassword').val(),
'dbEngine': $('#dbEngine').val(),
'db_prefix': $('#db_prefix').val()
},
dataType: 'json', dataType: 'json',
cache: false, cache: false,
success: function(json) success: function(json)
@@ -21,7 +24,15 @@ $(document).ready(function()
.removeClass((json.success) ? 'errorBlock' : 'okBlock') .removeClass((json.success) ? 'errorBlock' : 'okBlock')
.html(json.message) .html(json.message)
.slideDown('slow'); .slideDown('slow');
} },
error: function(xhr)
{
$("#dbResultCheck")
.addClass('errorBlock')
.removeClass('okBlock')
.html('An error occurred:<br /><br />'+xhr.responseText)
.slideDown('slow');
}
}); });
}); });
@@ -43,13 +54,17 @@ $(document).ready(function()
$("#mailResultCheck").slideUp('slow'); $("#mailResultCheck").slideUp('slow');
$.ajax({ $.ajax({
url: 'index.php', url: 'index.php',
data: 'sendMail=true&smtpSrv='+$('#smtpSrv').val() data: {
+'&smtpEnc='+$('#smtpEnc').val() 'sendMail': 'true',
+'&smtpPort='+$('#smtpPort').val() 'smtpSrv': $('#smtpSrv').val(),
+'&smtpLogin='+$('#smtpLogin').val() 'smtpEnc': $('#smtpEnc').val(),
+'&smtpPassword='+$('#smtpPassword').val() 'smtpPort': $('#smtpPort').val(),
+'&testEmail='+$('#testEmail').val() 'smtpLogin': $('#smtpLogin').val(),
+'&smtpChecked='+($('#set_stmp').attr('checked') ? 'true' : 'false'), 'smtpPassword': $('#smtpPassword').val(),
'testEmail': $('#smtpSrv').val(),
'testEmail': $('#testEmail').val(),
'smtpChecked': ($('#set_stmp').attr('checked') ? 'true' : 'false')
},
dataType: 'json', dataType: 'json',
cache: false, cache: false,
success: function(json) success: function(json)
@@ -59,7 +74,15 @@ $(document).ready(function()
.removeClass((json.success) ? 'errorBlock' : 'infosBlock') .removeClass((json.success) ? 'errorBlock' : 'infosBlock')
.html(json.message) .html(json.message)
.slideDown('slow'); .slideDown('slow');
} },
error: function(xhr)
{
$("#mailResultCheck")
.addClass('errorBlock')
.removeClass('infosBlock')
.html('An error occurred:<br /><br />'+xhr.responseText)
.slideDown('slow');
}
}); });
}); });
}); });