Added mechanism to allow existing Users to be notified (emailed) when…

… they're added to an organization.

organizations/app_settings.py

@@ -3,11 +3,13 @@
 
 from organizations.utils import model_field_attr
 
-
 ORGS_INVITATION_BACKEND = getattr(settings, 'INVITATION_BACKEND',
         'organizations.backends.defaults.InvitationBackend')
 
 ORGS_REGISTRATION_BACKEND = getattr(settings, 'REGISTRATION_BACKEND',
         'organizations.backends.defaults.RegistrationBackend')
 
+ORGS_NOTIFICATION_BACKEND = getattr(settings, 'NOTIFICATION_BACKEND',
+        'organizations.backends.defaults.NotificationBackend')
+
 ORGS_EMAIL_LENGTH = model_field_attr(User, 'email', 'max_length')

organizations/backends/__init__.py

@@ -1,8 +1,7 @@
 from django.utils.importlib import import_module
 
 from organizations.app_settings import (ORGS_INVITATION_BACKEND,
-        ORGS_REGISTRATION_BACKEND)
-
+        ORGS_REGISTRATION_BACKEND, ORGS_NOTIFICATION_BACKEND)
 
 def invitation_backend():
     # TODO exception handling
@@ -15,3 +14,8 @@ def registration_backend():
     class_module, class_name = ORGS_REGISTRATION_BACKEND.rsplit('.', 1)
     mod = import_module(class_module)
     return getattr(mod, class_name)()
+
+def notification_backend():
+    class_module, class_name = ORGS_NOTIFICATION_BACKEND.rsplit('.', 1)
+    mod = import_module(class_module)
+    return getattr(mod, class_name)()

organizations/backends/defaults.py

@@ -79,11 +79,10 @@ def send_reminder(self, user, sender=None, **kwargs):
     def _send_email(self, user, subject_template, body_template,
             sender=None, **kwargs):
         """Utility method for sending emails to new users"""
-        if not sender:
-            try:
-                from_email = settings.DEFAULT_FROM_EMAIL
-            except AttributeError:
-                raise ImproperlyConfigured(_("You must define DEFAULT_FROM_EMAIL in your settings"))
+        try:
+            from_email = settings.DEFAULT_FROM_EMAIL
+        except AttributeError:
+            raise ImproperlyConfigured(_("You must define DEFAULT_FROM_EMAIL in your settings"))
 
         if sender:
             from_email = "%s %s <%s>" % (sender.first_name, sender.last_name,
@@ -232,3 +231,23 @@ def send_invitation(self, user, sender=None, **kwargs):
         kwargs.update({'token': token})
         self._send_email(user, self.invitation_subject, self.invitation_body,
                 sender, **kwargs)
+
+class NotificationBackend(BaseBackend):
+    """A backend for notifying existing users that they have been added an
+    organization.
+    """
+    notification_subject = 'organizations/email/notification_subject.txt'
+    notification_body = 'organizations/email/notification_body.html'
+
+    def notify_by_email(self, email, sender=None, request=None, **kwargs):
+        """Sends an active user a notification email
+        """
+        try:
+            user = User.objects.get(email=email)
+            if not user.is_active:
+                return False
+            self._send_email(user, self.notification_subject, self.notification_body,
+                    sender, **kwargs)
+        except User.DoesNotExist:
+            pass
+

organizations/forms.py

@@ -5,7 +5,7 @@
 
 from organizations.models import Organization, OrganizationUser
 from organizations.utils import create_organization
-from organizations.backends import invitation_backend
+from organizations.backends import invitation_backend, notification_backend
 
 
 class OrganizationForm(forms.ModelForm):
@@ -78,8 +78,15 @@ def save(self, *args, **kwargs):
         except User.DoesNotExist:
             user = invitation_backend().invite_by_email(
                     self.cleaned_data['email'],
-                    **{'domain': get_current_site(self.request),
-                        'organization': self.organization})
+                    **{'site': get_current_site(self.request),
+                        'organization': self.organization,
+                        'sender': self.request.user})
+        else:
+            notification_backend().notify_by_email(self.cleaned_data['email'],
+                    **{'site': get_current_site(self.request),
+                        'organization': self.organization,
+                        'sender': self.request.user})
+
         return OrganizationUser.objects.create(user=user,
                 organization=self.organization,
                 is_admin=self.cleaned_data['is_admin'])