[myexperiment-hackers] [3042] trunk/app/controllers/memberships_controller.rb: Fixed group admin notification issue [MYEXP-2085]

[noreply]

Revision

3042

Author

fbacall

Date

2012-07-12 09:25:28 +0000 (Thu, 12 Jul 2012)

Log Message

Fixed group admin notification issue [MYEXP-2085]

Modified Paths

• trunk/app/controllers/memberships_controller.rb

Diff

Modified: trunk/app/controllers/memberships_controller.rb (3041 => 3042)

--- trunk/app/controllers/memberships_controller.rb	2012-07-11 13:56:30 UTC (rev 3041)
+++ trunk/app/controllers/memberships_controller.rb	2012-07-12 09:25:28 UTC (rev 3042)
@@ -164,7 +164,7 @@
             begin
               user = @membership.user
               network = @membership.network
-              Notifier.deliver_auto_join_group(user, network, base_host) if network.owner.send_notifications?
+              Notifier.deliver_auto_join_group(user, network, base_host) if network.administrators(true).any? {|a| a.send_notifications?}
             rescue
               logger.error("ERROR: failed to send email notification for auto join group. Membership ID: address@hidden")
             end
@@ -176,7 +176,7 @@
             begin
               user = @membership.user
               network = @membership.network
-              Notifier.deliver_membership_request(user, network, @membership, base_host) if network.owner.send_notifications?
+              Notifier.deliver_membership_request(user, network, @membership, base_host) if network.administrators(true).any? {|a| a.send_notifications?}
             rescue Exception => e
               logger.error("ERROR: failed to send Membership Request email notification. Membership ID: address@hidden")
               logger.error("EXCEPTION:" + e)