Minor fixes

remotes/origin/enhancement/email-actions
David Barragán Merino 2014-05-09 12:32:23 +02:00
parent 43750c3a19
commit 07a6f7232d
3 changed files with 10 additions and 5 deletions

View File

@ -23,16 +23,21 @@ def has_project_perm(user, project, perm):
if user.is_authenticated():
try:
membership = Membership.objects.get(project=project, user=user)
if membership.role.permissions.filter(codename=perm).count() > 0:
return True
return membership.role.permissions.filter(codename=perm).exists()
except Membership.DoesNotExist:
pass
return False
class BasePermission(permissions.BasePermission):
class Permission(permissions.BasePermission):
"""
Base permission class.
"""
pass
class BasePermission(Permission):
get_permission = None
post_permission = None
put_permission = None

View File

@ -41,6 +41,7 @@ class JsonField(serializers.WritableField):
def from_native(self, data):
return data
class AutoDomainField(serializers.WritableField):
"""
Automatically set domain field serializer.

View File

@ -16,7 +16,6 @@
import collections
def dict_sum(*args):
result = collections.Counter()
for arg in args: