From 305cb5cd61a629166827f34c55d60b52b7809e36 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 12 Jan 2016 10:04:25 +0100 Subject: [PATCH] Fixing get projects watched by user calculation --- taiga/projects/notifications/services.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/taiga/projects/notifications/services.py b/taiga/projects/notifications/services.py index 73681319..b7223fba 100644 --- a/taiga/projects/notifications/services.py +++ b/taiga/projects/notifications/services.py @@ -377,12 +377,13 @@ def get_projects_watched(user_or_id): """ if isinstance(user_or_id, get_user_model()): - user_id = user_or_id.id + user = user_or_id else: - user_id = user_or_id + user = get_user_model().objects.get(id=user_or_id) project_class = apps.get_model("projects", "Project") - return project_class.objects.filter(notify_policies__user__id=user_id).exclude(notify_policies__notify_level=NotifyLevel.none) + project_ids = user.notify_policies.exclude(notify_level=NotifyLevel.none).values_list("project__id", flat=True) + return project_class.objects.filter(id__in=project_ids) def add_watcher(obj, user): """Add a watcher to an object.