mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-09-12 09:13:08 +00:00
Fix circular import of utils
This commit is contained in:
parent
7cb869809e
commit
28c64c4eab
2 changed files with 9 additions and 9 deletions
|
@ -5,7 +5,7 @@ from django.db.models.signals import post_save
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
|
|
||||||
from re2o.mixins import AclMixin
|
from re2o.mixins import AclMixin
|
||||||
from re2o.utils import send_mail
|
import re2o.utils
|
||||||
|
|
||||||
from preferences.models import GeneralOption
|
from preferences.models import GeneralOption
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ class Ticket(AclMixin, models.Model):
|
||||||
obj = "New ticket opened"
|
obj = "New ticket opened"
|
||||||
template = loader.get_template("tickets/publication_mail_en")
|
template = loader.get_template("tickets/publication_mail_en")
|
||||||
|
|
||||||
send_mail(
|
re2o.utils.send_mail(
|
||||||
request,
|
request,
|
||||||
obj,
|
obj,
|
||||||
template.render(context),
|
template.render(context),
|
||||||
|
|
|
@ -83,7 +83,7 @@ from re2o.settings import LDAP, GID_RANGES, UID_RANGES
|
||||||
from re2o.field_permissions import FieldPermissionModelMixin
|
from re2o.field_permissions import FieldPermissionModelMixin
|
||||||
from re2o.mixins import AclMixin, RevMixin
|
from re2o.mixins import AclMixin, RevMixin
|
||||||
from re2o.base import smtp_check
|
from re2o.base import smtp_check
|
||||||
from re2o.utils import send_mail
|
import re2o.utils
|
||||||
|
|
||||||
from cotisations.models import Cotisation, Facture, Paiement, Vente
|
from cotisations.models import Cotisation, Facture, Paiement, Vente
|
||||||
from machines.models import Domain, Interface, Machine, regen
|
from machines.models import Domain, Interface, Machine, regen
|
||||||
|
@ -763,7 +763,7 @@ class User(
|
||||||
"pseudo": self.pseudo,
|
"pseudo": self.pseudo,
|
||||||
}
|
}
|
||||||
|
|
||||||
send_mail(
|
re2o.utils.send_mail(
|
||||||
request,
|
request,
|
||||||
"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")},
|
||||||
|
@ -792,7 +792,7 @@ class User(
|
||||||
"expire_in": str(GeneralOption.get_cached_value("req_expire_hrs")),
|
"expire_in": str(GeneralOption.get_cached_value("req_expire_hrs")),
|
||||||
}
|
}
|
||||||
|
|
||||||
send_mail(
|
re2o.utils.send_mail(
|
||||||
request,
|
request,
|
||||||
"Changement de mot de passe de %(name)s / Password change for "
|
"Changement de mot de passe de %(name)s / Password change for "
|
||||||
"%(name)s" % {"name": AssoOption.get_cached_value("name")},
|
"%(name)s" % {"name": AssoOption.get_cached_value("name")},
|
||||||
|
@ -877,7 +877,7 @@ class User(
|
||||||
"confirm_before_en": self.confirm_email_before_date().strftime("%Y-%m-%d"),
|
"confirm_before_en": self.confirm_email_before_date().strftime("%Y-%m-%d"),
|
||||||
}
|
}
|
||||||
|
|
||||||
send_mail(
|
re2o.utils.send_mail(
|
||||||
request,
|
request,
|
||||||
"Confirmation du mail de %(name)s / Email confirmation for "
|
"Confirmation du mail de %(name)s / Email confirmation for "
|
||||||
"%(name)s" % {"name": AssoOption.get_cached_value("name")},
|
"%(name)s" % {"name": AssoOption.get_cached_value("name")},
|
||||||
|
@ -933,7 +933,7 @@ class User(
|
||||||
"pseudo": self.pseudo,
|
"pseudo": self.pseudo,
|
||||||
}
|
}
|
||||||
|
|
||||||
send_mail(
|
re2o.utils.send_mail(
|
||||||
None,
|
None,
|
||||||
"Ajout automatique d'une machine / New machine autoregistered",
|
"Ajout automatique d'une machine / New machine autoregistered",
|
||||||
"",
|
"",
|
||||||
|
@ -953,7 +953,7 @@ class User(
|
||||||
"site_name": GeneralOption.get_cached_value("site_name"),
|
"site_name": GeneralOption.get_cached_value("site_name"),
|
||||||
}
|
}
|
||||||
|
|
||||||
send_mail(
|
re2o.utils.send_mail(
|
||||||
request,
|
request,
|
||||||
"Suspension automatique / Automatic suspension",
|
"Suspension automatique / Automatic suspension",
|
||||||
template.render(context),
|
template.render(context),
|
||||||
|
@ -1765,7 +1765,7 @@ class Ban(RevMixin, AclMixin, models.Model):
|
||||||
"asso_name": AssoOption.get_cached_value("name"),
|
"asso_name": AssoOption.get_cached_value("name"),
|
||||||
}
|
}
|
||||||
|
|
||||||
send_mail(
|
re2o.utils.send_mail(
|
||||||
request,
|
request,
|
||||||
"Déconnexion disciplinaire / Disciplinary disconnection",
|
"Déconnexion disciplinaire / Disciplinary disconnection",
|
||||||
template.render(context),
|
template.render(context),
|
||||||
|
|
Loading…
Reference in a new issue