From 65db15487ea527a686710975c045ea89cffbc7df Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 1 Nov 2013 09:25:19 +1100 Subject: [PATCH] Removes UI logic for installation detection, need to move this all to the UmbracoModule - then back port to 6.2 --- .../src/views/common/dialogs/login.controller.js | 5 ----- .../src/views/common/dialogs/login.html | 11 +---------- src/Umbraco.Web/Editors/BackOfficeController.cs | 15 +++++++-------- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js index ae76dda00e..0078cf492e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js @@ -15,11 +15,6 @@ $scope.today = weekday[d.getDay()]; $scope.errorMsg = ""; - //this means the application is not configured and needs the installer - if(!Umbraco.Sys.ServerVariables.application){ - $scope.missingConfiguration = true; - } - $scope.loginSubmit = function (login, password) { //if the login and password are not empty we need to automatically diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html index 6ece7c8bae..9db9848ca5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html @@ -1,16 +1,7 @@ 
- -
-

Umbraco has not yet been installed, - or you need to perform an upgrade. - Please open the umbraco installer -

- Open installer -
- -
+

Happy {{today}}!

Session timed out. Log in below

diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index f02f84b57a..40d03ecbb2 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -182,7 +182,7 @@ namespace Umbraco.Web.Editors }, {"isDebuggingEnabled", HttpContext.IsDebuggingEnabled}, { - "application", getApplicationState() + "application", GetApplicationState() } }; @@ -191,16 +191,15 @@ namespace Umbraco.Web.Editors } - private Dictionary getApplicationState() + private Dictionary GetApplicationState() { - if (!ApplicationContext.IsConfigured) + if (ApplicationContext.IsConfigured == false) return null; - var app = new Dictionary(); - app.Add("assemblyVersion", UmbracoVersion.AssemblyVersion); - app.Add("isReady", ApplicationContext.IsReady); - app.Add("isConfigured", ApplicationContext.IsConfigured); - app.Add("isDatabaseConfigured", ApplicationContext.DatabaseContext.IsDatabaseConfigured); + var app = new Dictionary + { + {"assemblyVersion", UmbracoVersion.AssemblyVersion} + }; var version = string.IsNullOrEmpty(UmbracoVersion.CurrentComment) ? UmbracoVersion.Current.ToString(3)