Merge pull request #6365 from hstastna/Save_button_canceling_change_p…

…asswd_user Make Save button disabled after canceling User's password changes
ManageIQ · Nov 11, 2019 · 5440f38 · 5440f38
2 parents 701caee + 79226e4
commit 5440f38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/assets/javascripts/miq_change_stored_password.js b/app/assets/javascripts/miq_change_stored_password.js
@@ -12,6 +12,8 @@ function changeStoredPassword(pfx, url) {
   $('#' + prefix + 'verify').removeAttr('disabled');
   $('#' + prefix + 'password').val('');
   $('#' + prefix + 'verify').val('');
+  $('#' + prefix + 'password').attr('placeholder', '');
+  $('#' + prefix + 'verify').attr('placeholder', '');
   miqJqueryRequest(url + '?' + prefix + 'password' + '=' + '&' + prefix + 'verify' + '=');
   $('#' + prefix + 'password').focus();
 }
@@ -27,7 +29,9 @@ function cancelPasswordChange(pfx, url) {
   $('#' + prefix + 'verify_group').css('display', 'none');
   $('#' + prefix + 'password').attr('disabled', 'disabled');
   $('#' + prefix + 'verify').attr('disabled', 'disabled');
-  $('#' + prefix + 'password').val(storedPasswordPlaceholder);
-  $('#' + prefix + 'verify').val(storedPasswordPlaceholder);
+  $('#' + prefix + 'password').attr('placeholder', storedPasswordPlaceholder);
+  $('#' + prefix + 'verify').attr('placeholder', storedPasswordPlaceholder);
+  $('#' + prefix + 'password').val('');
+  $('#' + prefix + 'verify').val('');
   miqJqueryRequest(url + '?' + prefix + 'password' + '=' + '&' + prefix + 'verify' + '=' + '&restore_password=true');
 }
diff --git a/app/views/ops/_rbac_user_details.html.haml b/app/views/ops/_rbac_user_details.html.haml
@@ -61,9 +61,10 @@
           .col-md-8
             %span.input-group{:style => "width: 100%"}
               = password_field_tag("password",
-                                   @edit[:new][:userid].blank? ? "" : stored_password_placeholder,
+                                   "",
                                    :maxlength         => 50,
                                    :disabled          => @edit[:new][:userid].blank? ? false : true,
+                                   :placeholder       => @edit[:new][:userid].blank? ? "" : stored_password_placeholder,
                                    :class             => "form-control",
                                    "data-miq_observe" => observe_url_json)
               - if @edit[:new][:userid] == "admin"