yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes UI logic for installation detection, need to move this all to the UmbracoModule - then back port to 6.2

Browse Source
This commit is contained in:
Shannon
2013-11-01 09:25:19 +11:00
parent c722e57914
commit 65db15487e
3 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
View File

@@ -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

11
src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
View File

@@ -1,16 +1,7 @@
<form name="loginForm" ng-submit="loginSubmit(login, password)" ng-controller="Umbraco.Dialogs.LoginController">
<div id="login" class="umb-modalcolumn" ng-class="{'show-validation': loginForm.$invalid}">
<div class="form" ng-show="missingConfiguration">
<h1>Umbraco has not yet been installed,
or you need to perform an upgrade.
Please open the umbraco installer
</h1>
<a href="../install" class="btn">Open installer</a>
</div>
<div class="form" ng-hide="missingConfiguration">
<div class="form">
<h1>Happy {{today}}!</h1>
<p><span ng-show="dialogData.isTimedOut">Session timed out. </span>Log in below</p>

15
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -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<string, object> getApplicationState()
private Dictionary<string, object> GetApplicationState()
{
if (!ApplicationContext.IsConfigured)
if (ApplicationContext.IsConfigured == false)
return null;
var app = new Dictionary<string, object>();
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<string, object>
{
{"assemblyVersion", UmbracoVersion.AssemblyVersion}
};
var version = string.IsNullOrEmpty(UmbracoVersion.CurrentComment)
? UmbracoVersion.Current.ToString(3)