Merge remote-tracking branch 'origin/v10/dev' into v11/dev

This commit is contained in:
Bjarke Berg
2023-02-15 14:06:39 +01:00
27 changed files with 613 additions and 55 deletions

View File

@@ -101,12 +101,15 @@
<div class="control-group">
<label class="control-label" for="dbType">Database</label>
<div class="controls -with-border">
<div class="input-readonly-text">
<div class="input-readonly-text" ng-if="installer.current.model.customInstallAvailable">
<strong>Provider:</strong>
{{installer.current.model.quickInstallSettings.displayName}}
<br /><strong>Name:</strong>
{{installer.current.model.quickInstallSettings.defaultDatabaseName}}
</div>
<div class="input-readonly-text" ng-if="!installer.current.model.customInstallAvailable">
A database has been pre-configured for your installation.
</div>
</div>
</div>
</div>