changeset 954:42e2437766c2 live

Merge from branch "bug_505"

--- a/app/helpers/application_helper.rb	Wed Jul 11 15:45:00 2012 +0100
+++ b/app/helpers/application_helper.rb	Wed Aug 29 15:55:57 2012 +0100
@@ -291,7 +291,13 @@
   def principals_check_box_tags(name, principals)
     s = ''
     principals.sort.each do |principal|
-      s << "<label>#{ check_box_tag name, principal.id, false } #{link_to_user principal}</label>\n"
+      
+      if principal.type == "User":      
+        s << "<label>#{ check_box_tag name, principal.id, false } #{link_to_user principal}</label>\n"
+      else
+        s << "<label>#{ check_box_tag name, principal.id, false } #{h principal} (Group)</label>\n"
+      end
+      
     end
     s.html_safe
   end

--- a/app/models/mailer.rb	Wed Jul 11 15:45:00 2012 +0100
+++ b/app/models/mailer.rb	Wed Aug 29 15:55:57 2012 +0100
@@ -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.
   #