Remove inline JS in change_password.twig template

MauricioFauth · MauricioFauth · commit f421836ebe05 · 2022-11-22T17:40:05.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/js/src/server/privileges.js b/js/src/server/privileges.js
@@ -461,6 +461,10 @@ const CheckAddUser = {
     }
 };
 
+const selectPasswordRadioWhenChangingPassword = () => {
+    $('#nopass_0').prop('checked', true);
+};
+
 /**
  * AJAX scripts for /server/privileges page.
  *
@@ -483,6 +487,9 @@ const CheckAddUser = {
 window.AJAX.registerTeardown('server/privileges.js', function () {
     $('#fieldset_add_user_login').off('change', 'input[name=\'username\']');
     $(document).off('click', '#deleteUserCard .btn.ajax');
+    $('#text_pma_change_pw').off('keyup');
+    $('#text_pma_change_pw').off('change');
+    $('#text_pma_change_pw2').off('change');
 
     const editUserGroupModal = document.getElementById('editUserGroupModal');
     if (editUserGroupModal) {
@@ -504,6 +511,8 @@ window.AJAX.registerOnload('server/privileges.js', function () {
     $('#text_pma_pw').on('keyup', PasswordStrength.handleEvent);
     $('#text_pma_pw').on('input', SwitchToUseTextField.handleEvent);
     $('#text_pma_change_pw').on('keyup', ChangePasswordStrength.handleEvent);
+    $('#text_pma_change_pw').on('change', selectPasswordRadioWhenChangingPassword);
+    $('#text_pma_change_pw2').on('change', selectPasswordRadioWhenChangingPassword);
     $(document).on('change', '#select_authentication_plugin', ShowSha256PasswordNotice.handleEvent);
     $(document).on('click', '#deleteUserCard .btn.ajax', RevokeUser.handleEvent);
 
diff --git a/templates/server/privileges/change_password.twig b/templates/server/privileges/change_password.twig
@@ -17,19 +17,17 @@
       </tr>
       <tr class="align-middle mb-4">
         <td>
-          <input type="radio" name="nopass" value="0" id="nopass_0" checked="checked">
+          <input type="radio" name="nopass" value="0" id="nopass_0" checked>
           <label for="nopass_0">{% trans 'Password:' %}&nbsp;</label>
         </td>
         <td>
           <div class="row">
             <span class="d-flex align-items-center col-4">{% trans 'Enter:' %}</span>
-            <input type="password" name="pma_pw" id="text_pma_change_pw" size="10" class="textfield col-6"
-                onkeyup="Functions.checkPasswordStrength($(this).val(), $('#change_password_strength_meter'), meter_obj_label = $('#change_password_strength'), window.CommonParams.get('user'));"
-                onchange="nopass[1].checked = true">
+            <input type="password" name="pma_pw" id="text_pma_change_pw" size="10" class="textfield col-6">
           </div>
           <div class="row mt-2">
             <span class="d-flex align-items-center col-4">{% trans 'Re-type:' %}</span>
-            <input type="password" name="pma_pw2" id="text_pma_change_pw2" size="10" class="textfield col-6" onchange="nopass[1].checked = true">
+            <input type="password" name="pma_pw2" id="text_pma_change_pw2" size="10" class="textfield col-6">
           </div>
         </td>
         <td class="col-2">
