Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit cce67c26c1ab · 2023-03-04T20:36:24.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/modules/functions.js b/js/src/modules/functions.js
@@ -379,7 +379,7 @@ Functions.checkPasswordStrength = function (value, meterObject, meterObjectLabel
         'my',
         'admin',
     ];
-    if (username !== null) {
+    if (username) {
         customDict.push(username);
     }
 
@@ -452,7 +452,7 @@ Functions.suggestPassword = function (passwordForm) {
     passwordForm.elements.pma_pw2.value = passwd.value;
     var meterObj = $jQueryPasswordForm.find('meter[name="pw_meter"]').first();
     var meterObjLabel = $jQueryPasswordForm.find('span[name="pw_strength"]').first();
-    Functions.checkPasswordStrength(passwd.value, meterObj, meterObjLabel);
+    Functions.checkPasswordStrength(passwd.value, meterObj, meterObjLabel, passwordForm.elements.username.value);
     return true;
 };
 
diff --git a/js/src/server/privileges.js b/js/src/server/privileges.js
@@ -449,7 +449,7 @@ const CheckAddUser = {
     handleEvent: function () {
         const theForm = this;
 
-        if (theForm.elements.hostname.value === '') {
+        if (theForm.elements.hostname && theForm.elements.hostname.value === '') {
             alert(window.Messages.strHostEmpty);
             theForm.elements.hostname.focus();
             return false;
