Converted User#mail_notification from a boolean to a string.
The string will now store which type of notification option to use. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4216 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
3a3263102a
commit
0316af7f6b
9 files changed
+58
-24
No files matched your search
@@ -382,7 +382,7 @@ class Project < ActiveRecord::Base
|
||||
|
||||
# Returns the mail adresses of users that should be always notified on project events
|
||||
def recipients
|
||||
members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
|
||||
members.select {|m| m.mail_notification? || m.user.mail_notification == 'all'}.collect {|m| m.user.mail}
|
||||
end
|
||||
|
||||
# Returns the users that should be notified on project events
|
||||
|
||||
+10
-1
@@ -33,6 +33,15 @@ class User < Principal
|
||||
:username => '#{login}'
|
||||
}
|
||||
|
||||
MAIL_NOTIFICATION_OPTIONS = [
|
||||
[:all, :label_user_mail_option_all],
|
||||
[:selected, :label_user_mail_option_selected],
|
||||
[:none, :label_user_mail_option_none],
|
||||
[:only_my_events, :label_user_mail_option_only_my_events],
|
||||
[:only_assigned, :label_user_mail_option_only_assigned],
|
||||
[:only_owner, :label_user_mail_option_only_owner]
|
||||
]
|
||||
|
||||
has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
|
||||
:after_remove => Proc.new {|user, group| group.user_removed(user)}
|
||||
has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
|
||||
@@ -65,7 +74,7 @@ class User < Principal
|
||||
validates_confirmation_of :password, :allow_nil => true
|
||||
|
||||
def before_create
|
||||
self.mail_notification = false
|
||||
self.mail_notification = 'only_my_events'
|
||||
true
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user