Changes of database connection

altairstudios · Mar 6, 2012 · fbdfa19 · fbdfa19
1 parent 820e4a5
commit fbdfa19
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 6 deletions.
diff --git a/AltairStudios.Core/Mvc/Controllers/AdminController.cs b/AltairStudios.Core/Mvc/Controllers/AdminController.cs
@@ -12,7 +12,7 @@
 namespace AltairStudios.Core.Mvc.Controllers {
 	public class AdminController : Controller {
 		[Authorize()]
-		public string Index() {
+		public ActionResult Index() {
 			StringBuilder html = new StringBuilder();
 			string path = MvcApplication.Path;
 
@@ -43,11 +43,15 @@ public class AdminController : Controller {
 			html.Append("</body>");
 			html.Append("</html>");
 
-			return html.ToString();
+			return Content(html.ToString());
 		}
 
 
-		public string Login() {
+		public ActionResult Login() {
+			/*if(MvcApplication.ConnectionString == "") {
+				return RedirectToAction("Install");
+			}*/
+
 			StringBuilder html = new StringBuilder();
 			string path = MvcApplication.Path;
 
@@ -80,7 +84,7 @@ public class AdminController : Controller {
 			html.Append("</body>");
 			html.Append("</html>");
 
-			return html.ToString();
+			return Content(html.ToString());
 		}
 
 
@@ -103,5 +107,43 @@ public class AdminController : Controller {
 			FormsAuthentication.SignOut();
 			return RedirectToAction("Login");
 		}
+
+
+
+		public ActionResult Install() {
+			StringBuilder html = new StringBuilder();
+			string path = MvcApplication.Path;
+
+			html.Append("<!DOCTYPE html>\n");
+			html.Append("<html lang='es'>");
+			html.Append("<head>");
+			html.Append("<meta charset='utf-8' />");
+			html.Append("<title>AltairStudios.Core - Admin</title>");
+			html.Append("<link rel='stylesheet' type='text/css' href='" + path + "/Bin/resources/css/Ext.css' />");
+			html.Append("<link rel='stylesheet' type='text/css' href='" + path + "/Bin/resources/css/Desktop.css' />");
+			html.Append("<script src='" + path + "/Bin/resources/javascript/Ext.js'></script>");
+
+			html.Append("<script type='text/javascript'>");			
+			html.Append("Ext.Loader.setConfig({enabled:true});");
+
+			html.Append("Ext.Loader.setPath({");
+	        html.Append("'AdminDesktop.Login': '" + path + "/Bin/resources/javascript/Login'");
+	        html.Append("});");
+
+	        html.Append("Ext.require('AdminDesktop.Login.App');");
+	        html.Append("var adminDesktopLogin = null;");
+	        html.Append("Ext.onReady(function () {");
+			html.Append("adminDesktopLogin = new AdminDesktop.Login.App();");
+			html.Append("adminDesktopLogin.show();");
+			html.Append("});");
+
+			html.Append("</script>");
+			html.Append("</head>");
+			html.Append("<body>");
+			html.Append("</body>");
+			html.Append("</html>");
+
+			return Content(html.ToString());
+		}
 	}
 }
diff --git a/AltairStudios.Core/Mvc/MvcApplication.cs b/AltairStudios.Core/Mvc/MvcApplication.cs
@@ -51,6 +51,10 @@ public class MvcApplication : System.Web.HttpApplication {
 			if(System.Web.HttpContext.Current.Request.ApplicationPath != "/") {
 				MvcApplication.path = System.Web.HttpContext.Current.Request.ApplicationPath;
 			}
+
+			if(ConfigurationManager.ConnectionStrings["SqlServerConnection"] != null) {
+				MvcApplication.connectionString = ConfigurationManager.ConnectionStrings["SqlServerConnection"].ConnectionString;
+			}
 		}
 	}
 }
diff --git a/AltairStudios.Core/bin/AltairStudios.Core.dll b/AltairStudios.Core/bin/AltairStudios.Core.dll
diff --git a/Tests/Bin/AltairStudios.Core.dll b/Tests/Bin/AltairStudios.Core.dll
diff --git a/Tests/Bin/Tests.dll b/Tests/Bin/Tests.dll
diff --git a/Tests/Web.config b/Tests/Web.config
@@ -88,7 +88,6 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
   </system.codedom>
   <system.web.extensions />
   <connectionStrings>
-	<remove name="MySqlServerConnection"/>
-	<add name="MySqlServerConnection" connectionString="Datasource=server;Database=database;uid=user;pwd=password;Pooling=true;Min Pool Size=0;Max Pool Size=100;" providerName="MySql.Data.MySqlClient"/>
+	<add name="SqlServerConnection" connectionString="Datasource=[server];Database=[database];uid=[user];pwd=[password];Pooling=true;Min Pool Size=0;Max Pool Size=100;" providerName="MySql.Data.MySqlClient"/>
   </connectionStrings>
 </configuration>