Browse Source

Code dupliqué, simplifie + django 1.10

test_david
Gabriel Detraz 9 years ago
committed by root
parent
commit
cda4548981
  1. 2
      re2o/context_processors.py
  2. 2
      users/models.py

2
re2o/context_processors.py

@ -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',))

2
users/models.py

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

Loading…
Cancel
Save