# HG changeset patch # User luisf # Date 1352805773 0 # Node ID 503ed68a4e0fd4ebfdcc9fa66a164e63fd014026 # Parent 64d990177cdaddc5f5d34c90ab306ce8ba143e03# Parent 3d924264419a72de616e5d03719dc15067477cfd Merge diff -r 3d924264419a -r 503ed68a4e0f app/helpers/application_helper.rb --- a/app/helpers/application_helper.rb Tue Nov 13 11:20:59 2012 +0000 +++ b/app/helpers/application_helper.rb Tue Nov 13 11:22:53 2012 +0000 @@ -291,7 +291,13 @@ def principals_check_box_tags(name, principals) s = '' principals.sort.each do |principal| - s << "\n" + + if principal.type == "User": + s << "\n" + else + s << "\n" + end + end s.html_safe end diff -r 3d924264419a -r 503ed68a4e0f app/models/mailer.rb --- a/app/models/mailer.rb Tue Nov 13 11:20:59 2012 +0000 +++ b/app/models/mailer.rb Tue Nov 13 11:22:53 2012 +0000 @@ -32,17 +32,25 @@ { :host => h, :protocol => Setting.protocol } end + # todo: luisf: 2Aug2012 - refactor... + def added_to_project(member, project) + principal = Principal.find(member.user_id) + if principal.type == "User" + user = User.find(member.user_id) + user_add_to_project(user, project) + else + users = Principal.find(member.user_id).users + users.map {|user| user_add_to_project(user, project) } + end + end # Builds a tmail object used to email the specified user that he was added to a project # # Example: - # add_to_project(user) => tmail object - # Mailer.deliver_add_to_project(user) => sends an email to the registered user - def added_to_project(member, project) - - user = User.find(member.user_id) - + # user_add_to_project(user, project) => tmail object + # Mailer.deliver_add_to_project(user, project) => sends an email to the registered user + def user_add_to_project(user, project) set_language_if_valid user.language recipients user.mail subject l(:mail_subject_added_to_project, Setting.app_title) @@ -50,8 +58,6 @@ :project_name => project.name render_multipart('added_to_project', body) end - - # Builds a tmail object used to email recipients of the added issue. #