// merge 1.4 (5916) => 1.5.x

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5918 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-15 10:30:56 +00:00
parent f8ee49ed56
commit ca5e60f0b9
41 changed files with 443 additions and 126 deletions
@@ -37,6 +37,7 @@ validShopInfos = false;
 upgradeCertify = false;
 dropdb=false;
 application="install";
+customModule="desactivate";

 function nextTab()
 {
@@ -838,7 +839,7 @@ function doUpgrade()
 	   url: "model.php",
 	   cache: false,
 	   data:
-	   	"method=doUpgrade"
+	   	"method=doUpgrade&customModule=" + customModule+ ""
 	   ,
 	   success: function(ret)
 	   {
@@ -1028,5 +1029,13 @@ $(document).ready(
 		$('#set_license').click(function() {
 			checkLicenseButton(this);
 		});
+		$("#customModuleDesactivation").bind('click',
+			function(){
+				if($("#customModuleDesactivation")[0].checked)
+					customModule = 'desactivate';
+				else
+					customModule = 'take the risk';
+			}
+		)
 	}
 );