rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-26 06:32:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_time' into 'master'

Browse source 
Fix l'évaluation de la date, non plus à l'import

See merge request federez/re2o!76
This commit is contained in:
Gabriel Detraz 2018-02-17 07:43:54 +01:00
commit 07d37932e9
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
re2o/utils.py
View file

@ -48,10 +48,8 @@ from machines.models import Domain, Interface, Machine
from users.models import Adherent, User, Ban, Whitelist
from preferences.models import Service
DT_NOW = timezone.now()
def all_adherent(search_time=DT_NOW):
def all_adherent(search_time=timezone.now()):
""" Fonction renvoyant tous les users adherents. Optimisee pour n'est
qu'une seule requete sql
Inspecte les factures de l'user et ses cotisation, regarde si elles
@ -70,7 +68,7 @@ def all_adherent(search_time=DT_NOW):
).distinct()
def all_baned(search_time=DT_NOW):
def all_baned(search_time=timezone.now()):
""" Fonction renvoyant tous les users bannis """
return User.objects.filter(
ban__in=Ban.objects.filter(
@ -79,7 +77,7 @@ def all_baned(search_time=DT_NOW):
).distinct()
def all_whitelisted(search_time=DT_NOW):
def all_whitelisted(search_time=timezone.now()):
""" Fonction renvoyant tous les users whitelistes """
return User.objects.filter(
whitelist__in=Whitelist.objects.filter(
@ -88,7 +86,7 @@ def all_whitelisted(search_time=DT_NOW):
).distinct()
def all_has_access(search_time=DT_NOW):
def all_has_access(search_time=timezone.now()):
""" Renvoie tous les users beneficiant d'une connexion
: user adherent ou whiteliste et non banni """
return User.objects.filter(