|
|
@ -57,7 +57,7 @@ from django.forms import ValidationError |
|
|
from django.db.models.signals import post_save, post_delete, m2m_changed |
|
|
from django.db.models.signals import post_save, post_delete, m2m_changed |
|
|
from django.dispatch import receiver |
|
|
from django.dispatch import receiver |
|
|
from django.utils.functional import cached_property |
|
|
from django.utils.functional import cached_property |
|
|
from django.template import Context, loader |
|
|
from django.template import loader |
|
|
from django.core.mail import send_mail |
|
|
from django.core.mail import send_mail |
|
|
from django.core.urlresolvers import reverse |
|
|
from django.core.urlresolvers import reverse |
|
|
from django.db import transaction |
|
|
from django.db import transaction |
|
|
@ -425,6 +425,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, |
|
|
def is_adherent(self): |
|
|
def is_adherent(self): |
|
|
""" Renvoie True si l'user est adhérent : si |
|
|
""" Renvoie True si l'user est adhérent : si |
|
|
self.end_adhesion()>now""" |
|
|
self.end_adhesion()>now""" |
|
|
|
|
|
return True |
|
|
end = self.end_adhesion() |
|
|
end = self.end_adhesion() |
|
|
if not end: |
|
|
if not end: |
|
|
return False |
|
|
return False |
|
|
@ -436,6 +437,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, |
|
|
def is_connected(self): |
|
|
def is_connected(self): |
|
|
""" Renvoie True si l'user est adhérent : si |
|
|
""" Renvoie True si l'user est adhérent : si |
|
|
self.end_adhesion()>now et end_connexion>now""" |
|
|
self.end_adhesion()>now et end_connexion>now""" |
|
|
|
|
|
return True |
|
|
end = self.end_connexion() |
|
|
end = self.end_connexion() |
|
|
if not end: |
|
|
if not end: |
|
|
return False |
|
|
return False |
|
|
@ -711,14 +713,14 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, |
|
|
template = loader.get_template('users/email_welcome') |
|
|
template = loader.get_template('users/email_welcome') |
|
|
mailmessageoptions, _created = MailMessageOption\ |
|
|
mailmessageoptions, _created = MailMessageOption\ |
|
|
.objects.get_or_create() |
|
|
.objects.get_or_create() |
|
|
context = Context({ |
|
|
context = { |
|
|
'nom': self.get_full_name(), |
|
|
'nom': self.get_full_name(), |
|
|
'asso_name': AssoOption.get_cached_value('name'), |
|
|
'asso_name': AssoOption.get_cached_value('name'), |
|
|
'asso_email': AssoOption.get_cached_value('contact'), |
|
|
'asso_email': AssoOption.get_cached_value('contact'), |
|
|
'welcome_mail_fr': mailmessageoptions.welcome_mail_fr, |
|
|
'welcome_mail_fr': mailmessageoptions.welcome_mail_fr, |
|
|
'welcome_mail_en': mailmessageoptions.welcome_mail_en, |
|
|
'welcome_mail_en': mailmessageoptions.welcome_mail_en, |
|
|
'pseudo': self.pseudo, |
|
|
'pseudo': self.pseudo, |
|
|
}) |
|
|
} |
|
|
send_mail( |
|
|
send_mail( |
|
|
'Bienvenue au %(name)s / Welcome to %(name)s' % { |
|
|
'Bienvenue au %(name)s / Welcome to %(name)s' % { |
|
|
'name': AssoOption.get_cached_value('name') |
|
|
'name': AssoOption.get_cached_value('name') |
|
|
@ -774,7 +776,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, |
|
|
machine_parent.user = self |
|
|
machine_parent.user = self |
|
|
interface_cible = Interface() |
|
|
interface_cible = Interface() |
|
|
interface_cible.mac_address = mac_address |
|
|
interface_cible.mac_address = mac_address |
|
|
interface_cible.type = machine_type_cible |
|
|
interface_cible.machine_type = machine_type_cible |
|
|
interface_cible.clean() |
|
|
interface_cible.clean() |
|
|
machine_parent.clean() |
|
|
machine_parent.clean() |
|
|
domain = Domain() |
|
|
domain = Domain() |
|
|
@ -796,14 +798,14 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, |
|
|
"""Notification mail lorsque une machine est automatiquement |
|
|
"""Notification mail lorsque une machine est automatiquement |
|
|
ajoutée par le radius""" |
|
|
ajoutée par le radius""" |
|
|
template = loader.get_template('users/email_auto_newmachine') |
|
|
template = loader.get_template('users/email_auto_newmachine') |
|
|
context = Context({ |
|
|
context = { |
|
|
'nom': self.get_full_name(), |
|
|
'nom': self.get_full_name(), |
|
|
'mac_address': interface.mac_address, |
|
|
'mac_address': interface.mac_address, |
|
|
'asso_name': AssoOption.get_cached_value('name'), |
|
|
'asso_name': AssoOption.get_cached_value('name'), |
|
|
'interface_name': interface.domain, |
|
|
'interface_name': interface.domain, |
|
|
'asso_email': AssoOption.get_cached_value('contact'), |
|
|
'asso_email': AssoOption.get_cached_value('contact'), |
|
|
'pseudo': self.pseudo, |
|
|
'pseudo': self.pseudo, |
|
|
}) |
|
|
} |
|
|
send_mail( |
|
|
send_mail( |
|
|
"Ajout automatique d'une machine / New machine autoregistered", |
|
|
"Ajout automatique d'une machine / New machine autoregistered", |
|
|
'', |
|
|
'', |
|
|
@ -1522,12 +1524,12 @@ class Ban(RevMixin, AclMixin, models.Model): |
|
|
def notif_ban(self): |
|
|
def notif_ban(self): |
|
|
""" Prend en argument un objet ban, envoie un mail de notification """ |
|
|
""" Prend en argument un objet ban, envoie un mail de notification """ |
|
|
template = loader.get_template('users/email_ban_notif') |
|
|
template = loader.get_template('users/email_ban_notif') |
|
|
context = Context({ |
|
|
context = { |
|
|
'name': self.user.get_full_name(), |
|
|
'name': self.user.get_full_name(), |
|
|
'raison': self.raison, |
|
|
'raison': self.raison, |
|
|
'date_end': self.date_end, |
|
|
'date_end': self.date_end, |
|
|
'asso_name': AssoOption.get_cached_value('name'), |
|
|
'asso_name': AssoOption.get_cached_value('name'), |
|
|
}) |
|
|
} |
|
|
send_mail( |
|
|
send_mail( |
|
|
'Déconnexion disciplinaire / Disciplinary disconnection', |
|
|
'Déconnexion disciplinaire / Disciplinary disconnection', |
|
|
template.render(context), |
|
|
template.render(context), |
|
|
|