rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-27 17:33:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'asso_user' into 'dev'

Browse source 
Fix #150 : l'utilisateur asso et ses machines ont toujours accès à internet

See merge request federez/re2o!372
This commit is contained in:
klafyvel 2018-12-29 20:42:46 +01:00
commit a798b81fed
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
re2o/utils.py
View file

@ -42,7 +42,7 @@ from django.db.models import Q
from cotisations.models import Cotisation, Facture, Vente from cotisations.models import Cotisation, Facture, Vente
from machines.models import Interface, Machine from machines.models import Interface, Machine
from users.models import Adherent, User, Ban, Whitelist from users.models import Adherent, User, Ban, Whitelist
from preferences.models import AssoOption
def all_adherent(search_time=None): def all_adherent(search_time=None):
""" Fonction renvoyant tous les users adherents. Optimisee pour n'est """ Fonction renvoyant tous les users adherents. Optimisee pour n'est
@ -88,11 +88,14 @@ def all_whitelisted(search_time=None):
def all_has_access(search_time=None): def all_has_access(search_time=None):
""" Renvoie tous les users beneficiant d'une connexion """ Return all connected users : active users and whitelisted +
: user adherent ou whiteliste et non banni """ asso_user defined in AssoOption pannel
----
Renvoie tous les users beneficiant d'une connexion
: user adherent et whiteliste non banni plus l'utilisateur asso"""
if search_time is None: if search_time is None:
search_time = timezone.now() search_time = timezone.now()
return User.objects.filter( filter_user = (
Q(state=User.STATE_ACTIVE) & Q(state=User.STATE_ACTIVE) &
~Q(ban__in=Ban.objects.filter(Q(date_start__lt=search_time) & Q(date_end__gt=search_time))) & ~Q(ban__in=Ban.objects.filter(Q(date_start__lt=search_time) & Q(date_end__gt=search_time))) &
(Q(whitelist__in=Whitelist.objects.filter(Q(date_start__lt=search_time) & Q(date_end__gt=search_time))) | (Q(whitelist__in=Whitelist.objects.filter(Q(date_start__lt=search_time) & Q(date_end__gt=search_time))) |
@ -107,7 +110,11 @@ def all_has_access(search_time=None):
).filter(Q(date_start__lt=search_time) & Q(date_end__gt=search_time)) ).filter(Q(date_start__lt=search_time) & Q(date_end__gt=search_time))
) )
))) )))
).distinct() )
asso_user = AssoOption.get_cached_value('utilisateur_asso')
if asso_user:
filter_user |= Q(id=asso_user.id)
return User.objects.filter(filter_user).distinct()
def filter_active_interfaces(interface_set): def filter_active_interfaces(interface_set):

3
users/models.py
View file

@ -475,7 +475,8 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
""" Renvoie si un utilisateur a accès à internet """ """ Renvoie si un utilisateur a accès à internet """
return (self.state == User.STATE_ACTIVE and return (self.state == User.STATE_ACTIVE and
not self.is_ban() and not self.is_ban() and
(self.is_connected() or self.is_whitelisted())) (self.is_connected() or self.is_whitelisted())) \
or self == AssoOption.get_cached_value('utilisateur_asso')
def end_access(self): def end_access(self):
""" Renvoie la date de fin normale d'accès (adhésion ou whiteliste)""" """ Renvoie la date de fin normale d'accès (adhésion ou whiteliste)"""