summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-08-13 02:56:04 +0000
committerGo MAEDA <maeda@farend.jp>2021-08-13 02:56:04 +0000
commit39e212dd8fc4a2f893ddf29efaa66daa14aad323 (patch)
treeebb4273a80c955f20269986ca40760b21c182906 /app
parente1e4736e973493ea075e049c7ef2d12edebe35bf (diff)
downloadredmine-39e212dd8fc4a2f893ddf29efaa66daa14aad323.tar.gz
redmine-39e212dd8fc4a2f893ddf29efaa66daa14aad323.zip
Password and Confirmation fields are marked as required when editing a user (#35731).
Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@21167 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/users/_form.html.erb4
1 files changed, 2 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>