Merge pull request #5680 from nyaruka/exclude_sys_users_from_notifica…

…tions

Don't send notifications to system users

temba/orgs/models.py

@@ -1058,9 +1058,9 @@ def get_users(self, *, roles: list = None, with_perm: str = None):
 
     def get_admins(self):
         """
-        Convenience method for getting all org administrators
+        Convenience method for getting all org administrators, excluding system users
         """
-        return self.get_users(roles=[OrgRole.ADMINISTRATOR])
+        return self.get_users(roles=[OrgRole.ADMINISTRATOR]).exclude(settings__is_system=True)
 
     def has_user(self, user: User) -> bool:
         """

temba/orgs/views/views.py

@@ -538,12 +538,7 @@ def save(self, obj):
             team = (team or self.request.org.default_ticket_team) if role == OrgRole.AGENT else None
 
             # don't update if user is the last administrator and role is being changed to something else
-            has_other_admins = (
-                self.request.org.get_users(roles=[OrgRole.ADMINISTRATOR])
-                .exclude(id=obj.id)
-                .exclude(settings__is_system=True)
-                .exists()
-            )
+            has_other_admins = self.request.org.get_admins().exclude(id=obj.id).exists()
             if role != OrgRole.ADMINISTRATOR and not has_other_admins:
                 return obj
 
@@ -575,13 +570,8 @@ def get_context_data(self, **kwargs):
         def post(self, request, *args, **kwargs):
             user = self.get_object()
 
-            # only actually remove user if they're not the last administator or a system user only for staff
-            if (
-                self.request.org.get_users(roles=[OrgRole.ADMINISTRATOR])
-                .exclude(id=user.id)
-                .exclude(settings__is_system=True)
-                .exists()
-            ):
+            # only actually remove user if they're not the last administator
+            if self.request.org.get_admins().exclude(id=user.id).exists():
                 self.request.org.remove_user(user)
 
             return HttpResponseRedirect(self.get_redirect_url())