Merge pull request #755 from Squidly271/patch-8

Multilanguage: Fix unable to delete / edit users
This commit is contained in:
tom mortensen
2020-10-12 09:49:17 -07:00
committed by GitHub
3 changed files with 5 additions and 3 deletions
@@ -146,7 +146,7 @@ _(Enable Docker)_:
:docker_enable_help:
_(Docker Stop Timeout)_:
: <input id="DOCKER_TIMEOUT" type="number" name="DOCKER_TIMEOUT" min='1' value="<?=$dockercfg['DOCKER_TIMEOUT']?>">
: <input class='narrow' id="DOCKER_TIMEOUT" type="number" name="DOCKER_TIMEOUT" min='1' value="<?=$dockercfg['DOCKER_TIMEOUT']?>">
:docker_timeout_help:
+3 -1
View File
@@ -57,7 +57,9 @@ function showPassword() {
function checkUsername(form) {
var username = form.userName.value.trim();
if (!username.match('^[a-z_][a-z0-9_-]*[$]?$')) {
$('input[name="cmdUserEdit"]').val("_(Add)_");
swal({title:"_(Invalid user name)_",text:"_(Use only lowercase letters, digits, underscores and dashes)_",type:"error",html:true,confirmButtonText:"_(Ok)_"});
return false;
}
if (form.userPasswordGUI.value.length > 128 || form.userPasswordConfGUI.value.length > 128) {
@@ -157,7 +159,7 @@ $(function(){
<form markdown="1" name="user_edit" method="POST" action="/update.htm" target="progressFrame" onsubmit="return checkUsername(this)">
_(User name)_:
: <input type="text" name="userName" maxlength="40" onKeyUp="this.form.cmdUserEdit.disabled=(this.form.userName.value=='')" pattern="^[a-z_][a-z0-9_-]*[$]?$">
: <input type="text" name="userName" maxlength="40" onKeyUp="this.form.cmdUserEdit.disabled=(this.form.userName.value=='')">
:user_add_username_help:
+1 -1
View File
@@ -189,7 +189,7 @@ _(Custom image)_:
<?else:?>
_(Delete)_<input type="checkbox" name="confirmDelete" onChange="chkDelete(this.form, this.form.cmdUserEdit)">
<?endif;?>
: <input type="submit" name="cmdUserEdit" value="_(Apply)_" onclick='if (this.value=="_(Delete)_")this.value="Delete" else this.value="Apply"' disabled><input type="button" value="_(Done)_" onclick="done('UserEdit')">
: <input type="submit" name="cmdUserEdit" value="_(Apply)_" onclick="if (this.value=='_(Delete)_') this.value='Delete'; else this.value='Apply';" disabled><input type="button" value="_(Done)_" onclick="done('UserEdit')">
</form>
<br><br>
<form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return checkPassword(this)">