Commit 4639276b authored by chirac's avatar chirac

Deplace la fonction precedemment crée pour éviter les imports circulaires

parent 2bcf765c
......@@ -10,7 +10,6 @@ from django.contrib import messages
from .models import NewMachineForm, EditMachineForm, EditInterfaceForm, AddInterfaceForm, NewInterfaceForm
from .models import Machine, Interface, IpList
from users.models import User
from users.views import has_access
def unassign_ips(user):
machines = Interface.objects.filter(machine=Machine.objects.filter(user=user))
......@@ -42,11 +41,6 @@ def unassign_ipv4(interface):
interface.ipv4 = None
interface.save()
def is_active(interface):
machine = interface.machine
user = machine.user
return machine.active and has_access(user)
def form(ctx, template, request):
c = ctx
c.update(csrf(request))
......
......@@ -64,6 +64,12 @@ def has_access(user):
""" Renvoie si un utilisateur a accès à internet"""
return user.state == User.STATE_ACTIVE and not is_ban(user) and ( is_adherent(user) or is_whitelisted(user))
def is_active(interface):
""" Renvoie si une interface doit avoir accès ou non """
machine = interface.machine
user = machine.user
return machine.active and has_access(user)
def form(ctx, template, request):
c = ctx
c.update(csrf(request))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment