SONAR-4064 No way to edit a user when its password is empty

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
index ff6bcd6ebbcaa06d4ee2f0222274428a78878c43..829589ba362cc167bcf28b7737c3c12e289d7a35 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
@@ -212,4 +212,9 @@ class User < ActiveRecord::Base
   def notify_creation_handlers
     Java::OrgSonarServerUi::JRubyFacade.getInstance().onNewUser({'login' => self.login, 'name' => self.name, 'email' => self.email})
   end
+
+  # Need to overwrite Authentication::ByPassword#password_required? for SONAR-4064  
+  def password_required?
+    (crypted_password.blank? && self.new_record?) || !password.blank?
+  end
 end