jro_apps/redmine Commit - r13504:e3618bdbecd9

Add support for multiple email addresses per user (#4244)....

Jean-Philippe Lang -

r13504:e3618bdbecd9

parent child

Context file:

r13504:e3618bdbecd9

Expand all files

app/controllers/email_addresses_controller.rb created 644 +105 0

@@ -0,0 +1,105
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class EmailAddressesController < ApplicationController
	19	before_filter :find_user, :require_admin_or_current_user
	20	before_filter :find_email_address, :only => [:update, :destroy]
	21
	22	def index
	23	@addresses = @user.email_addresses.order(:id).where(:is_default => false).to_a
	24	@address \|\|= EmailAddress.new
	25	end
	26
	27	def create
	28	saved = false
	29	if @user.email_addresses.count <= Setting.max_additional_emails.to_i
	30	@address = EmailAddress.new(:user => @user, :is_default => false)
	31	attrs = params[:email_address]
	32	if attrs.is_a?(Hash)
	33	@address.address = attrs[:address].to_s
	34	end
	35	saved = @address.save
	36	end
	37
	38	respond_to do \|format\|
	39	format.html {
	40	if saved
	41	redirect_to user_email_addresses_path(@user)
	42	else
	43	index
	44	render :action => 'index'
	45	end
	46	}
	47	format.js {
	48	@address = nil if saved
	49	index
	50	render :action => 'index'
	51	}
	52	end
	53	end
	54
	55	def update
	56	if params[:notify].present?
	57	@address.notify = params[:notify].to_s
	58	end
	59	@address.save
	60
	61	respond_to do \|format\|
	62	format.html {
	63	redirect_to user_email_addresses_path(@user)
	64	}
	65	format.js {
	66	@address = nil
	67	index
	68	render :action => 'index'
	69	}
	70	end
	71	end
	72
	73	def destroy
	74	@address.destroy
	75
	76	respond_to do \|format\|
	77	format.html {
	78	redirect_to user_email_addresses_path(@user)
	79	}
	80	format.js {
	81	@address = nil
	82	index
	83	render :action => 'index'
	84	}
	85	end
	86	end
	87
	88	private
	89
	90	def find_user
	91	@user = User.find(params[:user_id])
	92	end
	93
	94	def find_email_address
	95	@address = @user.email_addresses.where(:is_default => false).find(params[:id])
	96	rescue ActiveRecord::RecordNotFound
	97	render_404
	98	end
	99
	100	def require_admin_or_current_user
	101	unless @user == User.current
	102	require_admin
	103	end
	104	end
	105	end

app/helpers/email_addresses_helper.rb created 644 +38 0

@@ -0,0 +1,38
	1	# encoding: utf-8
	2	#
	3	# Redmine - project management software
	4	# Copyright (C) 2006-2015 Jean-Philippe Lang
	5	#
	6	# This program is free software; you can redistribute it and/or
	7	# modify it under the terms of the GNU General Public License
	8	# as published by the Free Software Foundation; either version 2
	9	# of the License, or (at your option) any later version.
	10	#
	11	# This program is distributed in the hope that it will be useful,
	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License
	17	# along with this program; if not, write to the Free Software
	18	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	19
	20	module EmailAddressesHelper
	21
	22	# Returns a link to enable or disable notifications for the address
	23	def toggle_email_address_notify_link(address)
	24	if address.notify?
	25	link_to image_tag('email.png'),
	26	user_email_address_path(address.user, address, :notify => '0'),
	27	:method => :put,
	28	:title => l(:label_disable_notifications),
	29	:remote => true
	30	else
	31	link_to image_tag('email_disabled.png'),
	32	user_email_address_path(address.user, address, :notify => '1'),
	33	:method => :put,
	34	:title => l(:label_enable_notifications),
	35	:remote => true
	36	end
	37	end
	38	end

app/models/email_address.rb created 644 +54 0

@@ -0,0 +1,54
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class EmailAddress < ActiveRecord::Base
	19	belongs_to :user
	20	attr_protected :id
	21
	22	after_update :destroy_tokens
	23	after_destroy :destroy_tokens
	24
	25	validates_presence_of :address
	26	validates_format_of :address, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
	27	validates_length_of :address, :maximum => User::MAIL_LENGTH_LIMIT, :allow_nil => true
	28	validates_uniqueness_of :address, :case_sensitive => false,
	29	:if => Proc.new {\|email\| email.address_changed? && email.address.present?}
	30
	31	def address=(arg)
	32	write_attribute(:address, arg.to_s.strip)
	33	end
	34
	35	def destroy
	36	if is_default?
	37	false
	38	else
	39	super
	40	end
	41	end
	42
	43	private
	44
	45	# Delete all outstanding password reset tokens on email change.
	46	# This helps to keep the account secure in case the associated email account
	47	# was compromised.
	48	def destroy_tokens
	49	if address_changed? \|\| destroyed?
	50	tokens = ['recovery']
	51	Token.where(:user_id => user_id, :action => tokens).delete_all
	52	end
	53	end
	54	end

app/views/email_addresses/_index.html.erb created 644 +26 0

@@ -0,0 +1,26
	1	<% if @addresses.present? %>
	2	<table class="list email_addresses">
	3	<% @addresses.each do \|address\| %>
	4	<tr class="<%= cycle("odd", "even") %>">
	5	<td class="email"><%= address.address %></td>
	6	<td class="buttons">
	7	<%= toggle_email_address_notify_link(address) %>
	8	<%= delete_link user_email_address_path(@user, address), :remote => true %>
	9	</td>
	10	</tr>
	11	<% end %>
	12	</table>
	13	<% end %>
	14
	15	<% unless @addresses.size >= Setting.max_additional_emails.to_i %>
	16	<div>
	17	<%= form_for @address, :url => user_email_addresses_path(@user), :remote => true do \|f\| %>
	18	<p><%= l(:label_email_address_add) %></p>
	19	<%= error_messages_for @address %>
	20	<p>
	21	<%= f.text_field :address, :size => 40 %>
	22	<%= submit_tag l(:button_add) %>
	23	</p>
	24	<% end %>
	25	</div>
	26	<% end %>

app/views/email_addresses/index.html.erb created 644 +2 0

@@ -0,0 +1,2
	1	<h2><%= @user.name %></h2>
	2	<%= render :partial => 'email_addresses/index' %>

app/views/email_addresses/index.js.erb created 644 +3 0

@@ -0,0 +1,3
	1	$('#ajax-modal').html('<%= escape_javascript(render :partial => 'email_addresses/index') %>');
	2	showModal('ajax-modal', '600px', '<%= escape_javascript l(:label_email_address_plural) %>');
	3	$('#email_address_address').focus();

db/migrate/20150113194759_create_email_addresses.rb created 644 +12 0

@@ -0,0 +1,12
	1	class CreateEmailAddresses < ActiveRecord::Migration
	2	def change
	3	create_table :email_addresses do \|t\|
	4	t.column :user_id, :integer, :null => false
	5	t.column :address, :string, :null => false
	6	t.column :is_default, :boolean, :null => false, :default => false
	7	t.column :notify, :boolean, :null => false, :default => true
	8	t.column :created_on, :timestamp, :null => false
	9	t.column :updated_on, :timestamp, :null => false
	10	end
	11	end
	12	end

db/migrate/20150113211532_populate_email_addresses.rb created 644 +14 0

@@ -0,0 +1,14
	1	class PopulateEmailAddresses < ActiveRecord::Migration
	2	def self.up
	3	t = EmailAddress.connection.quoted_true
	4	n = EmailAddress.connection.quoted_date(Time.now)
	5
	6	sql = "INSERT INTO #{EmailAddress.table_name} (user_id, address, is_default, notify, created_on, updated_on)" +
	7	" SELECT id, mail, #{t}, #{t}, '#{n}', '#{n}' FROM #{User.table_name} WHERE type = 'User' ORDER BY id"
	8	EmailAddress.connection.execute(sql)
	9	end
	10
	11	def self.down
	12	EmailAddress.delete_all
	13	end
	14	end

db/migrate/20150113213922_remove_users_mail.rb created 644 +9 0

@@ -0,0 +1,9
	1	class RemoveUsersMail < ActiveRecord::Migration
	2	def self.up
	3	remove_column :users, :mail
	4	end
	5
	6	def self.down
	7	raise IrreversibleMigration
	8	end
	9	end

db/migrate/20150113213955_add_email_addresses_user_id_index.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddEmailAddressesUserIdIndex < ActiveRecord::Migration
	2	def up
	3	add_index :email_addresses, :user_id
	4	end
	5
	6	def down
	7	remove_index :email_addresses, :user_id
	8	end
	9	end

public/images/email.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/email_add.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

public/images/email_disabled.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

test/fixtures/email_addresses.yml created 644 +57 0

@@ -0,0 +1,57
	1	---
	2	email_address_001:
	3	id: 1
	4	user_id: 1
	5	address: admin@somenet.foo
	6	is_default: true
	7	created_on: 2006-07-19 19:34:07 +02:00
	8	updated_on: 2006-07-19 19:34:07 +02:00
	9	email_address_002:
	10	id: 2
	11	user_id: 2
	12	address: jsmith@somenet.foo
	13	is_default: true
	14	created_on: 2006-07-19 19:34:07 +02:00
	15	updated_on: 2006-07-19 19:34:07 +02:00
	16	email_address_003:
	17	id: 3
	18	user_id: 3
	19	address: dlopper@somenet.foo
	20	is_default: true
	21	created_on: 2006-07-19 19:34:07 +02:00
	22	updated_on: 2006-07-19 19:34:07 +02:00
	23	email_address_004:
	24	id: 4
	25	user_id: 4
	26	address: rhill@somenet.foo
	27	is_default: true
	28	created_on: 2006-07-19 19:34:07 +02:00
	29	updated_on: 2006-07-19 19:34:07 +02:00
	30	email_address_005:
	31	id: 5
	32	user_id: 5
	33	address: dlopper2@somenet.foo
	34	is_default: true
	35	created_on: 2006-07-19 19:34:07 +02:00
	36	updated_on: 2006-07-19 19:34:07 +02:00
	37	email_address_007:
	38	id: 7
	39	user_id: 7
	40	address: someone@foo.bar
	41	is_default: true
	42	created_on: 2006-07-19 19:34:07 +02:00
	43	updated_on: 2006-07-19 19:34:07 +02:00
	44	email_address_008:
	45	id: 8
	46	user_id: 8
	47	address: miscuser8@foo.bar
	48	is_default: true
	49	created_on: 2006-07-19 19:34:07 +02:00
	50	updated_on: 2006-07-19 19:34:07 +02:00
	51	email_address_009:
	52	id: 9
	53	user_id: 9
	54	address: miscuser9@foo.bar
	55	is_default: true
	56	created_on: 2006-07-19 19:34:07 +02:00
	57	updated_on: 2006-07-19 19:34:07 +02:00

test/functional/email_addresses_controller_test.rb created 644 +144 0

@@ -0,0 +1,144
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../test_helper', __FILE__)
	19
	20	class EmailAddressesControllerTest < ActionController::TestCase
	21	fixtures :users, :email_addresses
	22
	23	def setup
	24	User.current = nil
	25	end
	26
	27	def test_index_with_no_additional_emails
	28	@request.session[:user_id] = 2
	29	get :index, :user_id => 2
	30	assert_response :success
	31	assert_template 'index'
	32	end
	33
	34	def test_index_with_additional_emails
	35	@request.session[:user_id] = 2
	36	EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
	37
	38	get :index, :user_id => 2
	39	assert_response :success
	40	assert_template 'index'
	41	assert_select '.email', :text => 'another@somenet.foo'
	42	end
	43
	44	def test_index_with_additional_emails_as_js
	45	@request.session[:user_id] = 2
	46	EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
	47
	48	xhr :get, :index, :user_id => 2
	49	assert_response :success
	50	assert_template 'index'
	51	assert_include 'another@somenet.foo', response.body
	52	end
	53
	54	def test_index_by_admin_should_be_allowed
	55	@request.session[:user_id] = 1
	56	get :index, :user_id => 2
	57	assert_response :success
	58	assert_template 'index'
	59	end
	60
	61	def test_index_by_another_user_should_be_denied
	62	@request.session[:user_id] = 3
	63	get :index, :user_id => 2
	64	assert_response 403
	65	end
	66
	67	def test_create
	68	@request.session[:user_id] = 2
	69	assert_difference 'EmailAddress.count' do
	70	post :create, :user_id => 2, :email_address => {:address => 'another@somenet.foo'}
	71	assert_response 302
	72	assert_redirected_to '/users/2/email_addresses'
	73	end
	74	email = EmailAddress.order('id DESC').first
	75	assert_equal 2, email.user_id
	76	assert_equal 'another@somenet.foo', email.address
	77	end
	78
	79	def test_create_as_js
	80	@request.session[:user_id] = 2
	81	assert_difference 'EmailAddress.count' do
	82	xhr :post, :create, :user_id => 2, :email_address => {:address => 'another@somenet.foo'}
	83	assert_response 200
	84	end
	85	end
	86
	87	def test_create_with_failure
	88	@request.session[:user_id] = 2
	89	assert_no_difference 'EmailAddress.count' do
	90	post :create, :user_id => 2, :email_address => {:address => 'invalid'}
	91	assert_response 200
	92	end
	93	end
	94
	95	def test_update
	96	@request.session[:user_id] = 2
	97	email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
	98
	99	put :update, :user_id => 2, :id => email.id, :notify => '0'
	100	assert_response 302
	101
	102	assert_equal false, email.reload.notify
	103	end
	104
	105	def test_update_as_js
	106	@request.session[:user_id] = 2
	107	email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
	108
	109	xhr :put, :update, :user_id => 2, :id => email.id, :notify => '0'
	110	assert_response 200
	111
	112	assert_equal false, email.reload.notify
	113	end
	114
	115	def test_destroy
	116	@request.session[:user_id] = 2
	117	email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
	118
	119	assert_difference 'EmailAddress.count', -1 do
	120	delete :destroy, :user_id => 2, :id => email.id
	121	assert_response 302
	122	assert_redirected_to '/users/2/email_addresses'
	123	end
	124	end
	125
	126	def test_destroy_as_js
	127	@request.session[:user_id] = 2
	128	email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
	129
	130	assert_difference 'EmailAddress.count', -1 do
	131	xhr :delete, :destroy, :user_id => 2, :id => email.id
	132	assert_response 200
	133	end
	134	end
	135
	136	def test_should_not_destroy_default
	137	@request.session[:user_id] = 2
	138
	139	assert_no_difference 'EmailAddress.count' do
	140	delete :destroy, :user_id => 2, :id => User.find(2).email_address.id
	141	assert_response 404
	142	end
	143	end
	144	end

app/controllers/users_controller.rb +1 -1

                 @status = params[:status] || 1
-                scope = User.logged.status(@status)
+                scope = User.logged.status(@status).preload(:email_address)
                 scope = scope.like(params[:name]) if params[:name].present?
                 scope = scope.in_group(params[:group_id]) if params[:group_id].present?

app/helpers/users_helper.rb +6 0

                 end
               end
+              def additional_emails_link(user)
+                if user.email_addresses.count > 1 || Setting.max_additional_emails.to_i > 0
+                  link_to l(:label_email_address_plural), user_email_addresses_path(@user), :class => 'icon icon-email-add', :remote => true
+                end
+              end
               def user_settings_tabs
                 tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
                         {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}

app/models/document.rb +4 0

                 @updated_on
               end
+              def notified_users
+                project.notified_users.reject {|user| !visible?(user)}
+              end
               private
               def send_notification

app/models/mail_handler.rb +1 -1

                 if user.allowed_to?("add_#{obj.class.name.underscore}_watchers".to_sym, obj.project)
                   addresses = [email.to, email.cc].flatten.compact.uniq.collect {|a| a.strip.downcase}
                   unless addresses.empty?
-                    User.active.where('LOWER(mail) IN (?)', addresses).each do |w|
+                    User.active.having_mail(addresses).each do |w|
                       obj.add_watcher(w)
                     end
                   end

app/models/mailer.rb +49 -22

                 @issue = issue
                 @users = to_users + cc_users
                 @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue)
-                mail :to => to_users.map(&:mail),
+                mail :to => to_users,
-                  :cc => cc_users.map(&:mail),
+                  :cc => cc_users,
                   :subject => "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
               end
                 @journal = journal
                 @journal_details = journal.visible_details(@users.first)
                 @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
-                mail :to => to_users.map(&:mail),
+                mail :to => to_users,
-                  :cc => cc_users.map(&:mail),
+                  :cc => cc_users,
                   :subject => s
               end
                 @issues_url = url_for(:controller => 'issues', :action => 'index',
                                             :set_filter => 1, :assigned_to_id => user.id,
                                             :sort => 'due_date:asc')
-                mail :to => user.mail,
+                mail :to => user,
                   :subject => l(:mail_subject_reminder, :count => issues.size, :days => days)
               end
                 @author = User.current
                 @document = document
                 @document_url = url_for(:controller => 'documents', :action => 'show', :id => document)
-                mail :to => document.recipients,
+                mail :to => document.notified_users,
                   :subject => "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
               end
                 when 'Project'
                   added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
                   added_to = "#{l(:label_project)}: #{container}"
-                  recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
+                  recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}
                 when 'Version'
                   added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
                   added_to = "#{l(:label_version)}: #{container.name}"
-                  recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}.collect  {|u| u.mail}
+                  recipients = container.project.notified_users.select {|user| user.allowed_to?(:view_files, container.project)}
                 when 'Document'
                   added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
                   added_to = "#{l(:label_document)}: #{container.title}"
-                  recipients = container.recipients
+                  recipients = container.notified_users
                 end
                 redmine_headers 'Project' => container.project.identifier
                 @attachments = attachments
                 references news
                 @news = news
                 @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-                mail :to => news.recipients,
+                mail :to => news.notified_users,
-                  :cc => news.cc_for_added_news,
+                  :cc => news.notified_watchers_for_added_news,
                   :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
               end
                 @news = news
                 @comment = comment
                 @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-                mail :to => news.recipients,
+                mail :to => news.notified_users,
-                 :cc => news.watcher_recipients,
+                 :cc => news.notified_watchers,
                  :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
               end
                 @author = message.author
                 message_id message
                 references message.root
-                recipients = message.recipients
+                recipients = message.notified_users
-                cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+                cc = ((message.root.notified_watchers + message.board.notified_watchers).uniq - recipients)
                 @message = message
                 @message_url = url_for(message.event_url)
                 mail :to => recipients,
                                 'Wiki-Page-Id' => wiki_content.page.id
                 @author = wiki_content.author
                 message_id wiki_content
-                recipients = wiki_content.recipients
+                recipients = wiki_content.notified_users
-                cc = wiki_content.page.wiki.watcher_recipients - recipients
+                cc = wiki_content.page.wiki.notified_watchers - recipients
                 @wiki_content = wiki_content
                 @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
                                                   :project_id => wiki_content.project,
                                 'Wiki-Page-Id' => wiki_content.page.id
                 @author = wiki_content.author
                 message_id wiki_content
-                recipients = wiki_content.recipients
+                recipients = wiki_content.notified_users
-                cc = wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients
+                cc = wiki_content.page.wiki.notified_watchers + wiki_content.page.notified_watchers - recipients
                 @wiki_content = wiki_content
                 @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
                                                   :project_id => wiki_content.project,
               #   Mailer.account_activation_request(user).deliver => sends an email to all active administrators
               def account_activation_request(user)
                 # Send the email to all active administrators
-                recipients = User.active.where(:admin => true).collect { |u| u.mail }.compact
+                recipients = User.active.where(:admin => true)
                 @user = user
                 @url = url_for(:controller => 'users', :action => 'index',
                                      :status => User::STATUS_REGISTERED,
                         'From' => Setting.mail_from,
                         'List-Id' => "<#{Setting.mail_from.to_s.gsub('@', '.')}>"
+                # Replaces users with their email addresses
+                [:to, :cc, :bcc].each do |key|
+                  if headers[key].present?
+                    headers[key] = self.class.email_addresses(headers[key])
+                  end
+                end
                 # Removes the author from the recipients and cc
                 # if the author does not want to receive notifications
                 # about what the author do
                 if @author && @author.logged? && @author.pref.no_self_notified
-                  headers[:to].delete(@author.mail) if headers[:to].is_a?(Array)
+                  addresses = @author.mails
-                  headers[:cc].delete(@author.mail) if headers[:cc].is_a?(Array)
+                  headers[:to] -= addresses if headers[:to].is_a?(Array)
+                  headers[:cc] -= addresses if headers[:cc].is_a?(Array)
                 end
                 if @author && @author.logged?
                 end
               end
+              # Returns an array of email addresses to notify by
+              # replacing users in arg with their notified email addresses
+              #
+              # Example:
+              #   Mailer.email_addresses(users)
+              #   => ["foo@example.net", "bar@example.net"]
+              def self.email_addresses(arg)
+                arr = Array.wrap(arg)
+                mails = arr.reject {|a| a.is_a? Principal}
+                users = arr - mails
+                if users.any?
+                  mails += EmailAddress.
+                    where(:user_id => users.map(&:id)).
+                    where("is_default = ? OR notify = ?", true, true).
+                    pluck(:address)
+                end
+                mails
+              end
               private
               # Appends a Redmine header field (name is prepended with 'X-Redmine-')

app/models/message.rb +4 0

                 usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
               end
+              def notified_users
+                project.notified_users.reject {|user| !visible?(user)}
+              end
               private
               def add_author_as_watcher

app/models/news.rb +16 -7

                 user.allowed_to?(:comment_news, project)
               end
+              def notified_users
+                project.users.select {|user| user.notify_about?(self) && user.allowed_to?(:view_news, project)}
+              end
               def recipients
-                project.users.select {|user| user.notify_about?(self) && user.allowed_to?(:view_news, project)}.map(&:mail)
+                notified_users.map(&:mail)
               end
-              # Returns the email addresses that should be cc'd when a new news is added
+              # Returns the users that should be cc'd when a new news is added
-              def cc_for_added_news
+              def notified_watchers_for_added_news
-                cc = []
+                watchers = []
                 if m = project.enabled_module('news')
-                  cc = m.notified_watchers
+                  watchers = m.notified_watchers
                   unless project.is_public?
-                    cc = cc.select {|user| project.users.include?(user)}
+                    watchers = watchers.select {|user| project.users.include?(user)}
                   end
                 end
-                cc.map(&:mail)
+                watchers
+              end
+              # Returns the email addresses that should be cc'd when a new news is added
+              def cc_for_added_news
+                notified_watchers_for_added_news.map(&:mail)
               end
               # returns latest news for projects visible by user

app/models/principal.rb +10 -2

                   where({})
                 else
                   pattern = "%#{q}%"
-                  sql = %w(login firstname lastname mail).map {|column| "LOWER(#{table_name}.#{column}) LIKE LOWER(:p)"}.join(" OR ")
+                  sql = %w(login firstname lastname).map {|column| "LOWER(#{table_name}.#{column}) LIKE LOWER(:p)"}.join(" OR ")
+                  sql << " OR #{table_name}.id IN (SELECT user_id FROM #{EmailAddress.table_name} WHERE LOWER(address) LIKE LOWER(:p))"
                   params = {:p => pattern}
                   if q =~ /^(.+)\s+(.+)$/
                     a, b = "#{$1}%", "#{$2}%"
                 to_s
               end
+              def mail=(*args)
+                nil
+              end
+              def mail
+                nil
+              end
               def visible?(user=User.current)
                 Principal.visible(user).where(:id => id).first == self
               end
                 self.hashed_password ||= ''
                 self.firstname ||= ''
                 self.lastname ||= ''
-                self.mail ||= ''
                 true
               end
             end

app/models/user.rb +41 -13

               has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
               has_one :rss_token, lambda {where "action='feeds'"}, :class_name => 'Token'
               has_one :api_token, lambda {where "action='api'"}, :class_name => 'Token'
+              has_one :email_address, lambda {where :is_default => true}, :autosave => true
+              has_many :email_addresses, :dependent => :delete_all
               belongs_to :auth_source
               scope :logged, lambda { where("#{User.table_name}.status <> #{STATUS_ANONYMOUS}") }
               LOGIN_LENGTH_LIMIT = 60
               MAIL_LENGTH_LIMIT = 60
-              validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
+              validates_presence_of :login, :firstname, :lastname, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
               validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, :case_sensitive => false
-              validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, :case_sensitive => false
               # Login must contain letters, numbers, underscores only
               validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i
               validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT
               validates_length_of :firstname, :lastname, :maximum => 30
-              validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
-              validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true
               validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
               validate :validate_password_length
               validate do
                 end
               end
+              before_validation :instantiate_email_address
               before_create :set_mail_notification
               before_save   :generate_password_if_needed, :update_hashed_password
               before_destroy :remove_references_before_destroy
                 where("#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
               }
               scope :sorted, lambda { order(*User.fields_for_order_statement)}
+              scope :having_mail, lambda {|arg|
+                addresses = Array.wrap(arg).map {|a| a.to_s.downcase}
+                if addresses.any?
+                  joins(:email_addresses).where("LOWER(address) IN (?)", addresses).uniq
+                else
+                  none
+                end
+              }
               def set_mail_notification
                 self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?
                 base_reload(*args)
               end
+              def mail
+                email_address.try(:address)
+              end
               def mail=(arg)
-                write_attribute(:mail, arg.to_s.strip)
+                email = email_address || build_email_address
+                email.address = arg
+              end
+              def mail_changed?
+                email_address.try(:address_changed?)
+              end
+              def mails
+                email_addresses.pluck(:address)
               end
               def self.find_or_initialize_by_identity_url(url)
               # Makes find_by_mail case-insensitive
               def self.find_by_mail(mail)
-                where("LOWER(mail) = ?", mail.to_s.downcase).first
+                having_mail(mail).first
               end
               # Returns true if the default admin account can no longer be used
               def self.anonymous
                 anonymous_user = AnonymousUser.first
                 if anonymous_user.nil?
-                  anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :mail => '', :login => '', :status => 0)
+                  anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :login => '', :status => 0)
                   raise 'Unable to create the anonymous user.' if anonymous_user.new_record?
                 end
                 anonymous_user
                 end
               end
+              def instantiate_email_address
+                email_address || build_email_address
+              end
               private
               def generate_password_if_needed
                 end
               end
-              # Delete all outstanding password reset tokens on password or email change.
+              # Delete all outstanding password reset tokens on password change.
               # Delete the autologin tokens on password change to prohibit session leakage.
               # This helps to keep the account secure in case the associated email account
               # was compromised.
               def destroy_tokens
-                tokens  = []
+                if hashed_password_changed?
-                tokens |= ['recovery', 'autologin'] if hashed_password_changed?
+                  tokens = ['recovery', 'autologin']
-                tokens |= ['recovery'] if mail_changed?
-                if tokens.any?
                   Token.where(:user_id => id, :action => tokens).delete_all
                 end
               end
               def logged?; false end
               def admin; false end
               def name(*args); I18n.t(:label_user_anonymous) end
+              def mail=(*args); nil end
               def mail; nil end
               def time_zone; nil end
               def rss_key; nil end
               def destroy
                 false
               end
+              protected
+              def instantiate_email_address
+              end
             end

app/models/wiki_content.rb +5 -3

                 page.nil? ? [] : page.attachments
               end
+              def notified_users
+                project.notified_users.reject {|user| !visible?(user)}
+              end
               # Returns the mail addresses of users that should be notified
               def recipients
-                notified = project.notified_users
+                notified_users.collect(&:mail)
-                notified.reject! {|user| !visible?(user)}
-                notified.collect(&:mail)
               end
               # Return true if the content is the current page content

app/views/my/account.html.erb +1 0

             <div class="contextual">
+            <%= additional_emails_link(@user) %>
             <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
             <%= call_hook(:view_my_account_contextual, :user => @user)%>
             </div>

app/views/settings/_authentication.html.erb +2 0

             <p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
+            <p><%= setting_text_field :max_additional_emails, :size => 6 %></p>
             <p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
             <p><%= setting_check_box :rest_api_enabled %></p>

app/views/users/edit.html.erb +1 0

             <div class="contextual">
             <%= link_to l(:label_profile), user_path(@user), :class => 'icon icon-user' %>
+            <%= additional_emails_link(@user) %>
             <%= change_status_link(@user) %>
             <%= delete_link user_path(@user) if User.current != @user %>
             </div>

config/initializers/10-patches.rb +1 -2

                 include Redmine::I18n
                 # Translate attribute names for validation errors display
                 def self.human_attribute_name(attr, *args)
-                  attr = attr.to_s.sub(/_id$/, '')
+                  attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
                   l("field_#{name.underscore.gsub('/', '_')}_#{attr}", :default => ["field_#{attr}".to_sym, attr])
                 end
               end

config/locales/en.yml +6 0

               field_firstname: First name
               field_lastname: Last name
               field_mail: Email
+              field_address: Email
               field_filename: File
               field_filesize: Size
               field_downloads: Downloads
               setting_force_default_language_for_anonymous: Force default language for anonymous users
               setting_force_default_language_for_loggedin: Force default language for logged-in users
               setting_link_copied_issue: Link issues on copy
+              setting_max_additional_emails: Maximum number of additional email addresses
               permission_add_project: Create project
               permission_add_subprojects: Create subprojects
               label_search_attachments_no: Do not search attachments
               label_search_attachments_only: Search attachments only
               label_search_open_issues_only: Open issues only
+              label_email_address_plural: Emails
+              label_email_address_add: Add email address
+              label_enable_notifications: Enable notifications
+              label_disable_notifications: Disable notifications
               button_login: Login
               button_submit: Submit

config/locales/fr.yml +6 0

               field_firstname: Prénom
               field_lastname: Nom
               field_mail: Email
+              field_address: Email
               field_filename: Fichier
               field_filesize: Taille
               field_downloads: Téléchargements
               setting_force_default_language_for_anonymous: Forcer la langue par défault pour les utilisateurs anonymes
               setting_force_default_language_for_loggedin: Forcer la langue par défault pour les utilisateurs identifiés
               setting_link_copied_issue: Lier les demandes lors de la copie
+              setting_max_additional_emails: Nombre maximal d'adresses email additionnelles
               permission_add_project: Créer un projet
               permission_add_subprojects: Créer des sous-projets
               label_search_attachments_no: Ne pas rechercher les fichiers
               label_search_attachments_only: Rechercher les fichiers uniquement
               label_search_open_issues_only: Demandes ouvertes uniquement
+              label_email_address_plural: Emails
+              label_email_address_add: Ajouter une adresse email
+              label_enable_notifications: Activer les notifications
+              label_disable_notifications: Désactiver les notifications
               button_login: Connexion
               button_submit: Soumettre

config/routes.rb +1 0

               resources :users do
                 resources :memberships, :controller => 'principal_memberships'
+                resources :email_addresses, :only => [:index, :create, :update, :destroy]
               end
               post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'

config/settings.yml +4 0

             password_min_length:
               format: int
               default: 8
+            # Maximum number of additional email addresses per user
+            max_additional_emails:
+              format: int
+              default: 5
             # Maximum lifetime of user sessions in minutes
             session_lifetime:
               format: int

public/javascripts/application.js +2 -2

               }
             }
-            function showModal(id, width) {
+            function showModal(id, width, title) {
               var el = $('#'+id).first();
               if (el.length === 0 || el.is(':visible')) {return;}
-              var title = el.find('h3.title').text();
+              if (!title) title = el.find('h3.title').text();
               el.dialog({
                 width: width,
                 modal: true,

public/stylesheets/application.css +3 -1

             table.list td.checkbox input {padding:0px;}
             table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
             table.list td.buttons a { padding-right: 0.6em; }
+            table.list td.buttons img {vertical-align:middle;}
             table.list td.reorder {width:15%; white-space:nowrap; text-align:center; }
             table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
             tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
             tr.user td {width:13%;white-space: nowrap;}
-            tr.user td.username, tr.user td.firstname, tr.user td.lastname, tr.user td.email {text-align:left;}
+            td.username, td.firstname, td.lastname, td.email {text-align:left !important;}
             tr.user td.email { width:18%; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             .icon-zoom-out { background-image: url(../images/zoom_out.png); }
             .icon-passwd { background-image: url(../images/textfield_key.png); }
             .icon-test { background-image: url(../images/bullet_go.png); }
+            .icon-email-add { background-image: url(../images/email_add.png); }
             .icon-file { background-image: url(../images/files/default.png); }
             .icon-file.text-plain { background-image: url(../images/files/text.png); }

test/fixtures/users.yml +17 -26

             ---
-            users_004:
-              created_on: 2006-07-19 19:34:07 +02:00
-              status: 1
-              last_login_on:
-              language: en
-              # password = foo
-              salt: 3126f764c3c5ac61cbfc103f25f934cf
-              hashed_password: 9e4dd7eeb172c12a0691a6d9d3a269f7e9fe671b
-              updated_on: 2006-07-19 19:34:07 +02:00
-              admin: false
-              mail: rhill@somenet.foo
-              lastname: Hill
-              firstname: Robert
-              id: 4
-              auth_source_id:
-              mail_notification: all
-              login: rhill
-              type: User
             users_001:
               created_on: 2006-07-19 19:12:21 +02:00
               status: 1
               hashed_password: b5b6ff9543bf1387374cdfa27a54c96d236a7150
               updated_on: 2006-07-19 22:57:52 +02:00
               admin: true
-              mail: admin@somenet.foo
               lastname: Admin
               firstname: Redmine
               id: 1
               hashed_password: bfbe06043353a677d0215b26a5800d128d5413bc
               updated_on: 2006-07-19 22:42:15 +02:00
               admin: false
-              mail: jsmith@somenet.foo
               lastname: Smith
               firstname: John
               id: 2
               hashed_password: 8f659c8d7c072f189374edacfa90d6abbc26d8ed
               updated_on: 2006-07-19 19:33:19 +02:00
               admin: false
-              mail: dlopper@somenet.foo
               lastname: Lopper
               firstname: Dave
               id: 3
               mail_notification: all
               login: dlopper
               type: User
+            users_004:
+              created_on: 2006-07-19 19:34:07 +02:00
+              status: 1
+              last_login_on:
+              language: en
+              # password = foo
+              salt: 3126f764c3c5ac61cbfc103f25f934cf
+              hashed_password: 9e4dd7eeb172c12a0691a6d9d3a269f7e9fe671b
+              updated_on: 2006-07-19 19:34:07 +02:00
+              admin: false
+              lastname: Hill
+              firstname: Robert
+              id: 4
+              auth_source_id:
+              mail_notification: all
+              login: rhill
+              type: User
             users_005:
               id: 5
               created_on: 2006-07-19 19:33:19 +02:00
               hashed_password: 1
               updated_on: 2006-07-19 19:33:19 +02:00
               admin: false
-              mail: dlopper2@somenet.foo
               lastname: Lopper2
               firstname: Dave2
               auth_source_id:
               hashed_password: 1
               updated_on: 2006-07-19 19:33:19 +02:00
               admin: false
-              mail: ''
               lastname: Anonymous
               firstname: ''
               auth_source_id:
               hashed_password: 8f659c8d7c072f189374edacfa90d6abbc26d8ed
               updated_on: 2006-07-19 19:33:19 +02:00
               admin: false
-              mail: someone@foo.bar
               lastname: One
               firstname: Some
               auth_source_id:
               hashed_password: 8f659c8d7c072f189374edacfa90d6abbc26d8ed
               updated_on: 2006-07-19 19:33:19 +02:00
               admin: false
-              mail: miscuser8@foo.bar
               lastname: Misc
               firstname: User
               auth_source_id:
               hashed_password: 1
               updated_on: 2006-07-19 19:33:19 +02:00
               admin: false
-              mail: miscuser9@foo.bar
               lastname: Misc
               firstname: User
               auth_source_id:

test/functional/admin_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class AdminControllerTest < ActionController::TestCase
-              fixtures :projects, :users, :roles
+              fixtures :projects, :users, :email_addresses, :roles
               def setup
                 User.current = nil

test/functional/documents_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class DocumentsControllerTest < ActionController::TestCase
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :enabled_modules, :documents, :enumerations,
                        :groups_users, :attachments

test/functional/issues_controller_test.rb +1 -1

             class IssuesControllerTest < ActionController::TestCase
               fixtures :projects,
-                       :users,
+                       :users, :email_addresses,
                        :roles,
                        :members,
                        :member_roles,

test/functional/issues_custom_fields_visibility_test.rb +1 -1

             class IssuesCustomFieldsVisibilityTest < ActionController::TestCase
               tests IssuesController
               fixtures :projects,
-                       :users,
+                       :users, :email_addresses,
                        :roles,
                        :members,
                        :member_roles,

test/functional/mail_handler_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class MailHandlerControllerTest < ActionController::TestCase
-              fixtures :users, :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :issue_statuses,
+              fixtures :users, :email_addresses, :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :issue_statuses,
                        :trackers, :projects_trackers, :enumerations
               FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler'

test/functional/messages_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class MessagesControllerTest < ActionController::TestCase
-              fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
+              fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
               def setup
                 User.current = nil

test/functional/my_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class MyControllerTest < ActionController::TestCase
-              fixtures :users, :user_preferences, :roles, :projects, :members, :member_roles,
+              fixtures :users, :email_addresses, :user_preferences, :roles, :projects, :members, :member_roles,
               :issues, :issue_statuses, :trackers, :enumerations, :custom_fields, :auth_sources
               def setup

test/functional/news_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class NewsControllerTest < ActionController::TestCase
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :enabled_modules, :news, :comments,
                        :attachments

test/functional/projects_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class ProjectsControllerTest < ActionController::TestCase
-              fixtures :projects, :versions, :users, :roles, :members,
+              fixtures :projects, :versions, :users, :email_addresses, :roles, :members,
                        :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses,
                        :enabled_modules, :enumerations, :boards, :messages,

test/functional/repositories_bazaar_controller_test.rb +1 -1

             class RepositoriesBazaarControllerTest < ActionController::TestCase
               tests RepositoriesController
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s

test/functional/repositories_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class RepositoriesControllerTest < ActionController::TestCase
-              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers

test/functional/repositories_cvs_controller_test.rb +1 -1

             class RepositoriesCvsControllerTest < ActionController::TestCase
               tests RepositoriesController
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s

test/functional/repositories_darcs_controller_test.rb +1 -1

             class RepositoriesDarcsControllerTest < ActionController::TestCase
               tests RepositoriesController
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s

test/functional/repositories_filesystem_controller_test.rb +1 -1

             class RepositoriesFilesystemControllerTest < ActionController::TestCase
               tests RepositoriesController
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/filesystem_repository').to_s

test/functional/repositories_git_controller_test.rb +1 -1

             class RepositoriesGitControllerTest < ActionController::TestCase
               tests RepositoriesController
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s

test/functional/repositories_mercurial_controller_test.rb +1 -1

             class RepositoriesMercurialControllerTest < ActionController::TestCase
               tests RepositoriesController
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :repositories, :enabled_modules
               REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s

test/functional/repositories_subversion_controller_test.rb +1 -1

             class RepositoriesSubversionControllerTest < ActionController::TestCase
               tests RepositoriesController
-              fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules,
                        :repositories, :issues, :issue_statuses, :changesets, :changes,
                        :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers

test/functional/users_controller_test.rb +1 -1

             class UsersControllerTest < ActionController::TestCase
               include Redmine::I18n
-              fixtures :users, :projects, :members, :member_roles, :roles,
+              fixtures :users, :email_addresses, :projects, :members, :member_roles, :roles,
                        :custom_fields, :custom_values, :groups_users,
                        :auth_sources,
                        :enabled_modules,

test/functional/wiki_controller_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class WikiControllerTest < ActionController::TestCase
-              fixtures :projects, :users, :roles, :members, :member_roles,
+              fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                        :enabled_modules, :wikis, :wiki_pages, :wiki_contents,
                        :wiki_content_versions, :attachments,
                        :issues, :issue_statuses

test/integration/account_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class AccountTest < Redmine::IntegrationTest
-              fixtures :users, :roles
+              fixtures :users, :email_addresses, :roles
               def test_login
                 get "/my/page"

test/integration/api_test/users_test.rb +1 -1

             require File.expand_path('../../../test_helper', __FILE__)
             class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
-              fixtures :users, :members, :member_roles, :roles, :projects
+              fixtures :users, :email_addresses, :members, :member_roles, :roles, :projects
               test "GET /users.xml should return users" do
                 get '/users.xml', {}, credentials('admin')

test/integration/issues_test.rb +1 -1

             class IssuesTest < Redmine::IntegrationTest
               fixtures :projects,
-                       :users,
+                       :users, :email_addresses,
                        :roles,
                        :members,
                        :member_roles,

test/integration/users_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class UsersTest < Redmine::IntegrationTest
-              fixtures :users
+              fixtures :users, :email_addresses
               def test_destroy_should_not_accept_get_requests
                 assert_no_difference 'User.count' do

test/unit/document_test.rb +1 -1

             class DocumentTest < ActiveSupport::TestCase
               fixtures :projects, :enumerations, :documents, :attachments,
                        :enabled_modules,
-                       :users, :members, :member_roles, :roles,
+                       :users, :email_addresses, :members, :member_roles, :roles,
                        :groups_users
               def test_create

test/unit/issue_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class IssueTest < ActiveSupport::TestCase
-              fixtures :projects, :users, :members, :member_roles, :roles,
+              fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles,
                        :groups_users,
                        :trackers, :projects_trackers,
                        :enabled_modules,

test/unit/mail_handler_test.rb +11 0

@@ -223,6 +223,17 class MailHandlerTest < ActiveSupport::TestCase
223	assert_equal 1, issue.watcher_user_ids.size	223	assert_equal 1, issue.watcher_user_ids.size
224	end	224	end
225		225
		226	def test_add_issue_from_additional_email_address
		227	user = User.find(2)
		228	user.mail = 'mainaddress@somenet.foo'
		229	user.save!
		230	EmailAddress.create!(:user => user, :address => 'jsmith@somenet.foo')
		231
		232	issue = submit_email('ticket_on_given_project.eml')
		233	assert issue
		234	assert_equal user, issue.author
		235	end
		236
226	def test_add_issue_by_unknown_user	237	def test_add_issue_by_unknown_user
227	assert_no_difference 'User.count' do	238	assert_no_difference 'User.count' do
228	assert_equal false,	239	assert_equal false,

test/unit/mailer_test.rb +33 -1

@@ -20,7 +20,7 require File.expand_path('../../test_helper', __FILE__)
20	class MailerTest < ActiveSupport::TestCase	20	class MailerTest < ActiveSupport::TestCase
21	include Redmine::I18n	21	include Redmine::I18n
22	include ActionDispatch::Assertions::SelectorAssertions	22	include ActionDispatch::Assertions::SelectorAssertions
23	fixtures :projects, :enabled_modules, :issues, :users, :members,	23	fixtures :projects, :enabled_modules, :issues, :users, :email_addresses, :members,
24	:member_roles, :roles, :documents, :attachments, :news,	24	:member_roles, :roles, :documents, :attachments, :news,
25	:tokens, :journals, :journal_details, :changesets,	25	:tokens, :journals, :journal_details, :changesets,
26	:trackers, :projects_trackers,	26	:trackers, :projects_trackers,
@@ -298,6 +298,14 class MailerTest < ActiveSupport::TestCase
298	assert last_email.bcc.include?('dlopper@somenet.foo')	298	assert last_email.bcc.include?('dlopper@somenet.foo')
299	end	299	end
300		300
		301	def test_issue_add_should_send_mail_to_all_user_email_address
		302	EmailAddress.create!(:user_id => 3, :address => 'otheremail@somenet.foo')
		303	issue = Issue.find(1)
		304	assert Mailer.deliver_issue_add(issue)
		305	assert last_email.bcc.include?('dlopper@somenet.foo')
		306	assert last_email.bcc.include?('otheremail@somenet.foo')
		307	end
		308
301	test "#issue_add should not notify project members that are not allow to view the issue" do	309	test "#issue_add should not notify project members that are not allow to view the issue" do
302	issue = Issue.find(1)	310	issue = Issue.find(1)
303	Role.find(2).remove_permission!(:view_issues)	311	Role.find(2).remove_permission!(:view_issues)
@@ -771,6 +779,30 class MailerTest < ActiveSupport::TestCase
771	ActionMailer::Base.delivery_method = :test	779	ActionMailer::Base.delivery_method = :test
772	end	780	end
773		781
		782	def test_email_addresses_should_keep_addresses
		783	assert_equal ["foo@example.net"],
		784	Mailer.email_addresses("foo@example.net")
		785
		786	assert_equal ["foo@example.net", "bar@example.net"],
		787	Mailer.email_addresses(["foo@example.net", "bar@example.net"])
		788	end
		789
		790	def test_email_addresses_should_replace_users_with_their_email_addresses
		791	assert_equal ["admin@somenet.foo"],
		792	Mailer.email_addresses(User.find(1))
		793
		794	assert_equal ["admin@somenet.foo", "jsmith@somenet.foo"],
		795	Mailer.email_addresses(User.where(:id => [1,2])).sort
		796	end
		797
		798	def test_email_addresses_should_include_notified_emails_addresses_only
		799	EmailAddress.create!(:user_id => 2, :address => "another@somenet.foo", :notify => false)
		800	EmailAddress.create!(:user_id => 2, :address => "another2@somenet.foo")
		801
		802	assert_equal ["another2@somenet.foo", "jsmith@somenet.foo"],
		803	Mailer.email_addresses(User.find(2)).sort
		804	end
		805
774	private	806	private
775		807
776	def last_email	808	def last_email

test/unit/user_test.rb +38 -7

             require File.expand_path('../../test_helper', __FILE__)
             class UserTest < ActiveSupport::TestCase
-              fixtures :users, :members, :projects, :roles, :member_roles, :auth_sources,
+              fixtures :users, :email_addresses, :members, :projects, :roles, :member_roles, :auth_sources,
                         :trackers, :issue_statuses,
                         :projects_trackers,
                         :watchers,
                 assert_equal "foo@bar.com", u.mail
               end
-              def test_mail_validation
+              def test_should_create_email_address
-                u = User.new
+                u = User.new(:firstname => "new", :lastname => "user")
+                u.login = "create_email_address"
+                u.mail = "defaultemail@somenet.foo"
+                assert u.save
+                u.reload
+                assert u.email_address
+                assert_equal "defaultemail@somenet.foo", u.email_address.address
+                assert_equal true, u.email_address.is_default
+                assert_equal true, u.email_address.notify
+              end
+              def test_should_not_create_user_without_mail
+                set_language_if_valid 'en'
+                u = User.new(:firstname => "new", :lastname => "user")
+                u.login = "user_without_mail"
+                assert !u.save
+                assert_equal ["Email #{I18n.translate('activerecord.errors.messages.blank')}"], u.errors.full_messages
+              end
+              def test_should_not_create_user_with_blank_mail
+                set_language_if_valid 'en'
+                u = User.new(:firstname => "new", :lastname => "user")
+                u.login = "user_with_blank_mail"
+                u.mail = ''
+                assert !u.save
+                assert_equal ["Email #{I18n.translate('activerecord.errors.messages.blank')}"], u.errors.full_messages
+              end
+              def test_should_not_update_user_with_blank_mail
+                set_language_if_valid 'en'
+                u = User.find(2)
                 u.mail = ''
-                assert !u.valid?
+                assert !u.save
-                assert_include I18n.translate('activerecord.errors.messages.blank'), u.errors[:mail]
+                assert_equal ["Email #{I18n.translate('activerecord.errors.messages.blank')}"], u.errors.full_messages
               end
               def test_login_length_validation
               end
               def test_mail_uniqueness_should_not_be_case_sensitive
+                set_language_if_valid 'en'
                 u = User.new(:firstname => "new", :lastname => "user", :mail => "newuser@somenet.foo")
                 u.login = 'newuser1'
                 u.password, u.password_confirmation = "password", "password"
                 u.login = 'newuser2'
                 u.password, u.password_confirmation = "password", "password"
                 assert !u.save
-                assert_include I18n.translate('activerecord.errors.messages.taken'), u.errors[:mail]
+                assert_include "Email #{I18n.translate('activerecord.errors.messages.taken')}", u.errors.full_messages
               end
               def test_update
                 assert_kind_of AnonymousUser, anon1
                 anon2 = AnonymousUser.create(
                             :lastname => 'Anonymous', :firstname => '',
-                            :mail => '', :login => '', :status => 0)
+                            :login => '', :status => 0)
                 assert_equal 1, anon2.errors.count
               end

test/unit/watcher_test.rb +1 -1

             require File.expand_path('../../test_helper', __FILE__)
             class WatcherTest < ActiveSupport::TestCase
-              fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules,
+              fixtures :projects, :users, :email_addresses, :members, :member_roles, :roles, :enabled_modules,
                        :issues, :issue_statuses, :enumerations, :trackers, :projects_trackers,
                        :boards, :messages,
                        :wikis, :wiki_pages,

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages