8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 09:26:27 +00:00

Code dupliqué, simplifie + django 1.10

This commit is contained in:
Gabriel Detraz 2016-12-18 22:25:21 +00:00 committed by root
parent 20f141686b
commit d264280ee3
2 changed files with 2 additions and 2 deletions

View file

@ -4,7 +4,7 @@ from .settings import SITE_NAME
def context_user(request):
user = request.user
if user.is_authenticated():
interfaces = Interface.objects.filter(machine=Machine.objects.filter(user=user, active=True))
interfaces = user.user_interfaces()
else:
interfaces = None
is_cableur = user.has_perms(('cableur',))

View file

@ -231,7 +231,7 @@ class User(AbstractBaseUser):
and not self.is_ban() and (self.is_adherent() or self.is_whitelisted())
def user_interfaces(self):
return Interface.objects.filter(machine__in=Machine.objects.filter(user=self))
return Interface.objects.filter(machine__in=Machine.objects.filter(user=self, active=True))
def has_module_perms(self, app_label):
# Simplest version again