diff options
| author | Go MAEDA <maeda@farend.jp> | 2021-08-13 03:00:52 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2021-08-13 03:00:52 +0000 |
| commit | 2af371526c89d9c5b3d1d435188d2b2473eafa4c (patch) | |
| tree | 56e277b7428e431c96b8f1a887178d793ee59132 /app | |
| parent | 8094f413c0e336ab388791af2a13dd7635e3a75f (diff) | |
| download | redmine-2af371526c89d9c5b3d1d435188d2b2473eafa4c.tar.gz redmine-2af371526c89d9c5b3d1d435188d2b2473eafa4c.zip | |
Merged r21167 from trunk to 4.1-stable (#35731).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21169 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/users/_form.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index bb20a4f9d..d423f61fc 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> |