From c26751db6bdeba376019b2a12707c17a2f085ee9 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 17 Sep 2013 21:27:14 +0200 Subject: [PATCH] models: do not aggregate delegate recursively when computing the set of users to notify about a document --- docbow_project/docbow/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docbow_project/docbow/models.py b/docbow_project/docbow/models.py index ef9dd66..0ca9348 100644 --- a/docbow_project/docbow/models.py +++ b/docbow_project/docbow/models.py @@ -734,8 +734,7 @@ class DocbowProfile(Model): class NotificationManager(Manager): def notify(self, document=None, users=None, kind='new-document', ctx=None): '''Build notifications in bulk''' - users = utils.queryset_fixpoint(users, - lambda s: User.objects.filter(delegations_by__by__in=s)) + users = set(users) | set(User.objects.filter(delegations_by__by__in=users)) users = User.objects.filter(pk__in=[u.pk for u in users]) \ .exclude(docbowprofile__accept_notifications=False) notifications = [Notification(user=user, document=document, kind=kind, ctx=ctx)