Skip to content

Commit 9a5960b

Browse files
author
Lewis Hazell
authored
Fixes (hides) customize button when connection string is already configured (#11273)
1 parent 9f72b7b commit 9a5960b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public override object ViewModel
117117
{
118118
minCharLength = _passwordConfiguration.RequiredLength,
119119
minNonAlphaNumericLength = _passwordConfiguration.GetMinNonAlphaNumericChars(),
120-
quickInstallAvailable = DatabaseConfigureStep.IsSqlCeAvailable()
120+
quickInstallAvailable = DatabaseConfigureStep.IsSqlCeAvailable() || DatabaseConfigureStep.IsLocalDbAvailable(),
121+
customInstallAvailable = !GetInstallState().HasFlag(InstallState.ConnectionStringConfigured)
121122
};
122123
}
123124
}

src/Umbraco.Web.UI.Client/src/installer/steps/user.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div ng-controller="Umbraco.Install.UserController">
1+
<div ng-controller="Umbraco.Install.UserController">
22
<h1>Install Umbraco</h1>
33

44
<p>Enter your name, email and password to install Umbraco with its default settings, alternatively you can customize your installation</p>
@@ -59,7 +59,7 @@ <h1>Install Umbraco</h1>
5959
<div class="control-group" ng-class="{disabled:myForm.$invalid}">
6060
<div class="controls">
6161
<input ng-if="installer.current.model.quickInstallAvailable" type="submit" ng-disabled="myForm.$invalid" value="Install" class="btn btn-success" />
62-
<button ng-if="installer.current.model.quickInstallAvailable" class="btn btn-info control-customize" ng-disabled="myForm.$invalid" ng-click="validateAndForward()">Customize</button>
62+
<button ng-if="installer.current.model.quickInstallAvailable && installer.current.model.customInstallAvailable" class="btn btn-info control-customize" ng-disabled="myForm.$invalid" ng-click="validateAndForward()">Customize</button>
6363

6464
<button ng-if="!installer.current.model.quickInstallAvailable" class="btn btn-primary control-customize" ng-disabled="myForm.$invalid" ng-click="validateAndForward()">Next</button>
6565
</div>

0 commit comments

Comments
 (0)