Fix for DB upgrade config file

rxtur · rxtur · commit 96d3e7f98020 · 2016-04-30T21:48:40.000-05:00
diff --git a/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetController.js b/BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetController.js
@@ -41,9 +41,8 @@
     }
 
     $scope.loadEditForm = function (id, name, title, zone) {
-        var sharedSrc = SiteVars.RelativeWebRoot + "Custom/Widgets/common.cshtml";
-        var customSrc = SiteVars.RelativeWebRoot + "Custom/Widgets/" + name + "/edit.cshtml";
-
+        var sharedSrc = SiteVars.RelativeWebRoot + "Custom/Widgets/common.cshtml?id=" + id + "&zone=" + zone;
+        var customSrc = SiteVars.RelativeWebRoot + "Custom/Widgets/" + name + "/edit.cshtml?id=" + id + "&zone=" + zone;
 
         $scope.editId = id;
         $scope.editTitle = title;
@@ -55,13 +54,13 @@
 
         $.ajax({
             type: 'HEAD',
-            url: customSrc + "?id=" + id,
+            url: customSrc,
             async: false,
             success: function () {
-                $scope.editSrc = customSrc + "?id=" + id + "&zone=" + zone;
+                $scope.editSrc = customSrc;
             },
             error: function () {
-                $scope.editSrc = sharedSrc + "?id=" + id + "&zone=" + zone;
+                $scope.editSrc = sharedSrc;
             }
         });
         // show modal and add the name of widget for class. and we will use in the CSS for the height of modal.
diff --git a/BlogEngine/BlogEngine.NET/setup/upgrade/Updater.asmx b/BlogEngine/BlogEngine.NET/setup/upgrade/Updater.asmx
@@ -376,7 +376,7 @@ public class Updater  : WebService {
         }
         else if (conPrv == "System.Data.SqlClient")
         {
-            sourceFile = _root + "\\setup\\upgrade\\backup\\be\\setup\\SQLServer\\SQLServerWeb.Config";
+            sourceFile = _root + "\\setup\\upgrade\\backup\\be\\setup\\SQLServer\\DbWeb.Config";
             defCon = @"Server=.\SQLEXPRESS;Database=BlogEngine;Trusted_Connection=True;";
         }
 

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ public class Updater : WebService {`
`376`	`376`	`}`
`377`	`377`	`else if (conPrv == "System.Data.SqlClient")`
`378`	`378`	`{`
`379`		`- sourceFile = _root + "\\setup\\upgrade\\backup\\be\\setup\\SQLServer\\SQLServerWeb.Config";`
	`379`	`+ sourceFile = _root + "\\setup\\upgrade\\backup\\be\\setup\\SQLServer\\DbWeb.Config";`
`380`	`380`	`defCon = @"Server=.\SQLEXPRESS;Database=BlogEngine;Trusted_Connection=True;";`
`381`	`381`	`}`
`382`	`382`