From cea0f764335c4c0450992a29a8d47b64d72fd1a6 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 5 Apr 2019 13:33:19 +0200 Subject: [PATCH] ui: tfa: also include validity check for password field Signed-off-by: Thomas Lamprecht --- www/manager6/dc/TFAEdit.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/www/manager6/dc/TFAEdit.js b/www/manager6/dc/TFAEdit.js index 83a33df9..acc49350 100644 --- a/www/manager6/dc/TFAEdit.js +++ b/www/manager6/dc/TFAEdit.js @@ -155,7 +155,8 @@ Ext.define('PVE.window.TFAEdit', { var viewModel = me.getViewModel(); var form = me.lookup('totp_form'); var challenge = me.lookup('challenge'); - viewModel.set('valid', form.isValid() && challenge.isValid()); + var password = me.lookup('password'); + viewModel.set('valid', form.isValid() && challenge.isValid() && password.isValid()); } }, '#': { @@ -436,8 +437,9 @@ Ext.define('PVE.window.TFAEdit', { fieldLabel: gettext('Password'), minLength: 5, reference: 'password', - padding: '0 5', - labelWidth: 120, + allowBlank: false, + validateBlank: true, + padding: '0 0 5 5', emptyText: gettext('verify current password') } ],