- Make validation a bit nicer:
- Add timeout to the DB validation - Make DB validation exception handling a bit nicer - Move the DB validation error message - Fix bug around RADOS config default for Is Secure - Allow hiding of the validation box
This commit is contained in:
parent
47fb10b79f
commit
bfd273d16f
6 changed files with 56 additions and 20 deletions
|
@ -348,10 +348,6 @@
|
|||
Could not connect to or validate the database configuration found. Please reconfigure to continue.
|
||||
</div>
|
||||
|
||||
<div class="alert alert-warning" ng-show="databaseInvalid">
|
||||
Database Validation Issue: {{ databaseInvalid }}
|
||||
</div>
|
||||
|
||||
<p>
|
||||
Please enter the connection details for your <strong>empty</strong> database. The schema will be created in the following step.</p>
|
||||
</p>
|
||||
|
@ -369,33 +365,32 @@
|
|||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table class="config-table" ng-show="fields.kind">
|
||||
<tr>
|
||||
<tr ng-show="fields.kind">
|
||||
<td>Database Server:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="fields.server"
|
||||
placeholder="The database server hostname"></span>
|
||||
placeholder="localhost"></span>
|
||||
<div class="help-text">
|
||||
The server (and optionally, custom port) where the database lives
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr ng-show="fields.kind">
|
||||
<td>Database Name:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="fields.database"
|
||||
placeholder="The name of the database on the server"></span>
|
||||
placeholder="registry-database"></span>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<tr ng-show="fields.kind">
|
||||
<td>Username:</td>
|
||||
<td>
|
||||
<span class="config-string-field" binding="fields.username"
|
||||
placeholder="Username for accessing the database"></span>
|
||||
<div class="help-text">The user must have full access to the database</div>
|
||||
placeholder="someuser"></span>
|
||||
<div class="help-text">This user must have <strong>full access</strong> to the database</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr ng-show="fields.kind">
|
||||
<td>Password:</td>
|
||||
<td>
|
||||
<input class="form-control" type="password" ng-model="fields.password"></span>
|
||||
|
@ -404,6 +399,9 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer alert alert-warning" ng-show="databaseInvalid">
|
||||
Database Validation Issue: {{ databaseInvalid }}
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="submit" class="btn btn-primary" ng-disabled="!databaseUri"
|
||||
ng-click="validateDatabase()"
|
||||
|
|
Reference in a new issue