From 438b0be904943ac2fd87296ac4ad23437fc5c230 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 6 Mar 2014 17:21:43 +0100 Subject: [PATCH] Fix wrong user type check on domain model. --- taiga/base/domains/models.py | 6 +++--- taiga/base/domains/serializers.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/taiga/base/domains/models.py b/taiga/base/domains/models.py index c2a3a555..1f5ab093 100644 --- a/taiga/base/domains/models.py +++ b/taiga/base/domains/models.py @@ -47,13 +47,13 @@ class Domain(models.Model): return self.domain def user_is_owner(self, user): - return self.members.filter(id=user.id, is_owner=True).count() > 0 + return self.members.filter(user_id=user.id, is_owner=True).exists() def user_is_staff(self, user): - return self.members.filter(id=user.id, is_staff=True).count() > 0 + return self.members.filter(user_id=user.id, is_staff=True).exists() def user_is_normal_user(self, user): - return self.members.filter(id=user.id, is_owner=False, is_staff=False).count() > 0 + return self.members.filter(user_id=user.id, is_owner=False, is_staff=False).exists() class DomainMember(models.Model): diff --git a/taiga/base/domains/serializers.py b/taiga/base/domains/serializers.py index 3adc97a6..5976f3da 100644 --- a/taiga/base/domains/serializers.py +++ b/taiga/base/domains/serializers.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- from rest_framework import serializers -from .models import Domain, DomainMember from taiga.base.users.serializers import UserSerializer +from .models import Domain, DomainMember + class DomainSerializer(serializers.ModelSerializer): projects = serializers.SerializerMethodField('get_projects') @@ -18,5 +19,6 @@ class DomainSerializer(serializers.ModelSerializer): class DomainMemberSerializer(serializers.ModelSerializer): user = UserSerializer() + class Meta: model = DomainMember