diff options
Diffstat (limited to 'coip/apps')
| -rw-r--r-- | coip/apps/auth/views.py | 8 | ||||
| -rw-r--r-- | coip/apps/name/models.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/coip/apps/auth/views.py b/coip/apps/auth/views.py index 0539171..29b66c2 100644 --- a/coip/apps/auth/views.py +++ b/coip/apps/auth/views.py @@ -21,13 +21,15 @@ def meta(request,attr): def accounts_login_federated(request): if request.user.is_authenticated(): profile,created = UserProfile.objects.get_or_create(identifier=request.user.username) - if profile.user: - request.user = profile.user - else: + if created: profile.identifier = request.user.username + request.user.delete() request.user = User(username=anonid()) request.user.save() profile.user = request.user + else: + request.user = profile.user + update = False cn = meta(request,'HTTP_CN') diff --git a/coip/apps/name/models.py b/coip/apps/name/models.py index 530775f..4de5946 100644 --- a/coip/apps/name/models.py +++ b/coip/apps/name/models.py @@ -137,7 +137,7 @@ class Name(models.Model): anyuser = lookup("system:anyuser",True) if NameLink.objects.filter(src=self,dst=anyuser,type=NameLink.access_control,data__contains=perm).count() > 0: return True - if NameLink.objects.filter(src=self,type=NameLink.access_control,data__contains=perm,dst__memberships__user=user).count() > 0: + if NameLink.objects.filter(src=self,type=NameLink.access_control,data__contains=perm,dst__membership__user=user).count() > 0: return True if user.is_superuser: |