taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong user type check on domain model.

remotes/origin/enhancement/email-actions
Andrey Antukh 2014-03-06 17:21:43 +01:00
parent f1347f0a0b
commit 438b0be904
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
taiga/base/domains/models.py
View File

@ -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):

4
taiga/base/domains/serializers.py
View File

@ -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