Commit 5feff22b authored by Joachim Kołodziejski's avatar Joachim Kołodziejski
Browse files

Fix mails/models.py import bug, remove unused files

parent 1f495c43

home/models.py

deleted100644 → 0
+0 −3
Changes for home/models.py: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line 
from django.db import models



# Create your models here.

home/tests.py

deleted100644 → 0
+0 −3
Changes for home/tests.py: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line 
from django.test import TestCase



# Create your tests here.

mails/models.py

+16 −24
Changes for mails/models.py: 16 added lines, 24 removed lines.
Original line number Diff line number Diff line 
from django.conf import settings

from django.db import models

from django.settings import (

    DEFAULT_FROM_EMAIL,

    EMAIL_BATCH_SIZE,

    EMAIL_HOST,

    EMAIL_HOST_PASSWORD,

    EMAIL_HOST_USER,

    EMAIL_PORT,

    EMAIL_USE_TLS,

)

from solo.models import SingletonModel



from voters.models import Voter
@@ -50,47 +42,47 @@ class Mail(models.Model): 
class MailServerConfig(SingletonModel):

    host = models.CharField(

        max_length=256,

        default=EMAIL_HOST,

        default=settings.EMAIL_HOST,

        verbose_name="serwer",

        help_text=f"rekomendowany: {EMAIL_HOST}",

        help_text=f"rekomendowany: {settings.EMAIL_HOST}",

    )

    port = models.IntegerField(

        default=EMAIL_PORT,

        default=settings.EMAIL_PORT,

        verbose_name="port",

        help_text=f"rekomendowany: {EMAIL_PORT}",

        help_text=f"rekomendowany: {settings.EMAIL_PORT}",

    )

    use_tls = models.BooleanField(

        default=EMAIL_USE_TLS,

        default=settings.EMAIL_USE_TLS,

        verbose_name="TLS",

        help_text=f"rekomendowane: {'TAK' if EMAIL_USE_TLS else 'NIE'}",

        help_text=f"rekomendowane: {'TAK' if settings.EMAIL_USE_TLS else 'NIE'}",

    )



    username = models.CharField(

        max_length=256,

        default=EMAIL_HOST_USER,

        default=settings.EMAIL_HOST_USER,

        verbose_name="login",

        help_text="rekomendowany: {EMAIL_HOST_USER}",

        help_text="rekomendowany: {settings.EMAIL_HOST_USER}",

    )

    password = models.CharField(

        max_length=256,

        default=EMAIL_HOST_PASSWORD,

        default=settings.EMAIL_HOST_PASSWORD,

        verbose_name="hasło",

        help_text="rekomendowane: {EMAIL_HOST_PASSWORD}"

        if EMAIL_HOST_PASSWORD != ""

        help_text="rekomendowane: {settings.EMAIL_HOST_PASSWORD}"

        if settings.EMAIL_HOST_PASSWORD != ""

        else None,

    )



    sender = models.CharField(

        max_length=256,

        default=DEFAULT_FROM_EMAIL,

        default=settings.DEFAULT_FROM_EMAIL,

        verbose_name="nadawca wiadomości",

        help_text=f"rekomendowany: {DEFAULT_FROM_EMAIL}",

        help_text=f"rekomendowany: {settings.DEFAULT_FROM_EMAIL}",

    )



    batch_size = models.IntegerField(

        default=20,

        default=settings.EMAIL_BATCH_SIZE,

        verbose_name="liczba wiadomości w pojedynczym pakiecie",

        help_text=f"Rekomendowana: {EMAIL_BATCH_SIZE}",

        help_text=f"Rekomendowana: {settings.EMAIL_BATCH_SIZE}",

    )



    def __str__(self):