8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 07:23:46 +00:00

Merge branch 'fix_users_models_shenanigans' into 'dev'

Fix users/models.py shenanigans

See merge request re2o/re2o!600
This commit is contained in:
klafyvel 2021-01-24 16:21:12 +01:00
commit e549d005dd

View file

@ -92,8 +92,10 @@ from PIL import Image
from io import BytesIO
import sys
# General utilities
def linux_user_check(login):
"""Check if a login comply with unix base login policy
@ -1862,6 +1864,7 @@ class User(
"""
return self.theme.split(".")[0]
class Adherent(User):
"""Base re2o Adherent model, inherit from User. Add other attributes.
@ -1923,7 +1926,7 @@ class Adherent(User):
:return: An adherent.
"""
return cls.objects.get(pk=adherentid)
return cls.objects.get(pk=object_id)
@staticmethod
def can_create(user_request, *_args, **_kwargs):
@ -2790,4 +2793,3 @@ class EMailAddress(RevMixin, AclMixin, models.Model):
if result:
raise ValidationError(reason)
super(EMailAddress, self).clean(*args, **kwargs)