Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

web ui better usability when creating dbs, issue: #1623'

This commit is contained in:
hkernbach 2015-12-22 17:47:15 +01:00
parent 65ed4432cf
commit 64eb028ba3
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
js/apps/system/_admin/aardvark/APP/frontend/js/views/databaseView.js
View File

@ -145,13 +145,21 @@
}, },
submitCreateDatabase: function() { submitCreateDatabase: function() {
var self = this; var self = this, userPassword,
var name = $('#newDatabaseName').val(); name = $('#newDatabaseName').val(),
var userName = $('#newUser').val(); userName = $('#newUser').val();
var userPassword = $('#newPassword').val();
if ($('#useDefaultPassword').val() === 'true') {
userPassword = 'ARANGODB_DEFAULT_ROOT_PASSWORD';
}
else {
userPassword = $('#newPassword').val();
}
if (!this.validateDatabaseInfo(name, userName, userPassword)) { if (!this.validateDatabaseInfo(name, userName, userPassword)) {
return; return;
} }
var options = { var options = {
name: name, name: name,
users: [ users: [
@ -334,11 +342,19 @@
] ]
) )
); );
tableContent.push(
window.modalView.createSelectEntry(
"useDefaultPassword",
"Use default password",
true,
"Read the password from the environment variable ARANGODB_DEFAULT_ROOT_PASSWORD.",
[{value: false, label: "No"}, {value: true, label: "Yes"}] )
);
tableContent.push( tableContent.push(
window.modalView.createPasswordEntry( window.modalView.createPasswordEntry(
"newPassword", "newPassword",
"Password", "Password",
"ARANGODB_DEFAULT_ROOT_PASSWORD", "",
false, false,
"", "",
false false
@ -356,6 +372,18 @@
buttons, buttons,
tableContent tableContent
); );
$('#useDefaultPassword').change(function() {
if ($('#useDefaultPassword').val() === 'true') {
$('#row_newPassword').hide();
}
else {
$('#row_newPassword').show();
}
});
$('#row_newPassword').hide();
} }
}); });