Fixes (hides) customize button when connection string is already conf…

…igured (umbraco#11273)
Nuklon · Oct 10, 2021 · 9a5960b · 9a5960b
1 parent 9f72b7b
commit 9a5960b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
@@ -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)
                 };
             }
         }

diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html
@@ -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>
@@ -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>