From 2b6423a396c22e0ea6cf4a21de2155a4789d7315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 20 May 2014 10:21:29 +0200 Subject: [PATCH] Fix watchers validator like in stable branch --- taiga/projects/mixins/notifications.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/taiga/projects/mixins/notifications.py b/taiga/projects/mixins/notifications.py index ef588cec..7b34038f 100644 --- a/taiga/projects/mixins/notifications.py +++ b/taiga/projects/mixins/notifications.py @@ -99,18 +99,11 @@ class WatcherValidationSerializerMixin(object): if values: project = None if "project" in attrs and attrs["project"]: - if self.object and attrs["project"] == self.object.project.id: - project = self.object.project - else: - project_model = get_model("projects", "Project") - try: - project = project_model.objects.get(project__id=attrs["project"]) - except project_model.DoesNotExist: - pass + project = attrs["project"] elif self.object: project = self.object.project - if len(values) != get_model("projects", "Membership").objects.filter(project=project, - user__in=values).count(): + model_cls = get_model("projects", "Membership") + if len(values) != model_cls.objects.filter(project=project, user__in=values).count(): raise serializers.ValidationError("Error, some watcher user is not a member of the project") return attrs