meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-22 08:21:14 +00:00
Code Issues Releases Wiki Activity

Prevent admins from sending themselves their own password (#21436).

Browse Source 
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@14966 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-12-06 20:46:26 +00:00
parent e6b7c73169
commit 389527296e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -143,7 +143,7 @@ class UsersController < ApplicationController
if was_activated
Mailer.account_activated(@user).deliver
elsif @user.active? && params[:send_information] && @user.password.present? && @user.auth_source_id.nil?
elsif @user.active? && params[:send_information] && @user.password.present? && @user.auth_source_id.nil? && @user != User.current
Mailer.account_information(@user, @user.password).deliver
end

2
app/views/users/_general.html.erb
View File

@ -1,6 +1,6 @@
<%= labelled_form_for @user do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
<% if @user.active? && email_delivery_enabled? -%>
<% if @user.active? && email_delivery_enabled? && @user != User.current -%>
<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
<% end -%>
<p><%= submit_tag l(:button_save) %></p>