diff options
| -rw-r--r-- | app/views/users/_form.html.erb | 4 | ||||
| -rw-r--r-- | test/functional/users_controller_test.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 4b030d920..0d50d3d56 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -32,13 +32,13 @@ <% end %> <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>"> <p> - <%= f.password_field :password, :required => true, :size => 25 %> + <%= f.password_field :password, :required => @user.new_record?, :size => 25 %> <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em> <% if Setting.password_required_char_classes.any? %> <em class="info"><%= l(:text_characters_must_contain, :character_classes => Setting.password_required_char_classes.collect{|c| l("label_password_char_class_#{c}")}.join(", ")) %></em> <% end %> </p> - <p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p> + <p><%= f.password_field :password_confirmation, :required => @user.new_record?, :size => 25 %></p> <p><%= f.check_box :generate_password %></p> <p><%= f.check_box :must_change_passwd %></p> </div> diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index 4dae5138f..247d81120 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -280,6 +280,7 @@ class UsersControllerTest < Redmine::ControllerTest get :new assert_response :success assert_select 'input[name=?]', 'user[login]' + assert_select 'label[for=?]>span.required', 'user_password', 1 end def test_create @@ -482,6 +483,7 @@ class UsersControllerTest < Redmine::ControllerTest assert_response :success assert_select 'h2>a+img.gravatar' assert_select 'input[name=?][value=?]', 'user[login]', 'jsmith' + assert_select 'label[for=?]>span.required', 'user_password', 0 end def test_edit_registered_user |