Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes (hides) customize button when connection string is already configured #11273

Merged
merged 2 commits into from
Oct 10, 2021
Merged

Fixes (hides) customize button when connection string is already configured #11273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c45d9b
Fixes #11187 - Hide custom install button when connection string is c…
lewishazell Oct 4, 2021
7169f08
Quick install is available for LocalDB.
Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public override object ViewModel
{
minCharLength = _passwordConfiguration.RequiredLength,
minNonAlphaNumericLength = _passwordConfiguration.GetMinNonAlphaNumericChars(),
quickInstallAvailable = DatabaseConfigureStep.IsSqlCeAvailable()
quickInstallAvailable = DatabaseConfigureStep.IsSqlCeAvailable() || DatabaseConfigureStep.IsLocalDbAvailable(),
customInstallAvailable = !GetInstallState().HasFlag(InstallState.ConnectionStringConfigured)
};
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/installer/steps/user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Install.UserController">
<div ng-controller="Umbraco.Install.UserController">
<h1>Install Umbraco</h1>

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

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