Commit 0ce64a00 authored by Joachim Kołodziejski's avatar Joachim Kołodziejski
Browse files

SMTP config: make defaults dynamic, temporarily delete help_text

parent c370d741
Loading
Loading
Loading
Loading
+72 −0
Changes for mails/migrations/0008_alter_mailserverconfig_batch_size_and_more.py: 72 added lines, 0 removed lines.
Original line number Diff line number Diff line
# Generated by Django 6.0.9 on 2026-10-15 09:21

from django.db import migrations, models

import mails.models


class Migration(migrations.Migration):
    dependencies = [
        ("mails", "0007_alter_mailserverconfig_batch_size_and_more"),
    ]

    operations = [
        migrations.AlterField(
            model_name="mailserverconfig",
            name="batch_size",
            field=models.IntegerField(
                default=mails.models.get_email_batch_size,
                verbose_name="liczba wiadomości w pojedynczym pakiecie",
            ),
        ),
        migrations.AlterField(
            model_name="mailserverconfig",
            name="host",
            field=models.CharField(
                default=mails.models.get_email_host,
                max_length=256,
                verbose_name="serwer",
            ),
        ),
        migrations.AlterField(
            model_name="mailserverconfig",
            name="password",
            field=models.CharField(
                default=mails.models.get_email_host_password,
                max_length=256,
                verbose_name="hasło",
            ),
        ),
        migrations.AlterField(
            model_name="mailserverconfig",
            name="port",
            field=models.IntegerField(
                default=mails.models.get_email_port, verbose_name="port"
            ),
        ),
        migrations.AlterField(
            model_name="mailserverconfig",
            name="sender",
            field=models.CharField(
                default=mails.models.get_default_from_email,
                max_length=256,
                verbose_name="nadawca wiadomości",
            ),
        ),
        migrations.AlterField(
            model_name="mailserverconfig",
            name="use_tls",
            field=models.BooleanField(
                default=mails.models.get_email_use_tls, verbose_name="TLS"
            ),
        ),
        migrations.AlterField(
            model_name="mailserverconfig",
            name="username",
            field=models.CharField(
                default=mails.models.get_email_host_user,
                max_length=256,
                verbose_name="login",
            ),
        ),
    ]
+35 −16
Changes for mails/models.py: 35 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -39,50 +39,69 @@ class Mail(models.Model):
        permissions = [("can_manage_mails", "Może zarządzać wysyłaniem maili")]


def get_email_host():
    return settings.EMAIL_HOST


def get_email_port():
    return settings.EMAIL_PORT


def get_email_use_tls():
    return settings.EMAIL_USE_TLS


def get_email_host_user():
    return settings.EMAIL_HOST_USER


def get_email_host_password():
    return settings.EMAIL_HOST_PASSWORD


def get_default_from_email():
    return settings.DEFAULT_FROM_EMAIL


def get_email_batch_size():
    return settings.EMAIL_BATCH_SIZE


class MailServerConfig(SingletonModel):
    host = models.CharField(
        max_length=256,
        default=settings.EMAIL_HOST,
        default=get_email_host,
        verbose_name="serwer",
        help_text=f"rekomendowany: {settings.EMAIL_HOST}",
    )
    port = models.IntegerField(
        default=settings.EMAIL_PORT,
        default=get_email_port,
        verbose_name="port",
        help_text=f"rekomendowany: {settings.EMAIL_PORT}",
    )
    use_tls = models.BooleanField(
        default=settings.EMAIL_USE_TLS,
        default=get_email_use_tls,
        verbose_name="TLS",
        help_text=f"rekomendowane: {'TAK' if settings.EMAIL_USE_TLS else 'NIE'}",
    )

    username = models.CharField(
        max_length=256,
        default=settings.EMAIL_HOST_USER,
        default=get_email_host_user,
        verbose_name="login",
        help_text=f"rekomendowany: {settings.EMAIL_HOST_USER}",
    )
    password = models.CharField(
        max_length=256,
        default=settings.EMAIL_HOST_PASSWORD,
        default=get_email_host_password,
        verbose_name="hasło",
        help_text=f"rekomendowane: {settings.EMAIL_HOST_PASSWORD}"
        if settings.EMAIL_HOST_PASSWORD != ""
        else None,
    )

    sender = models.CharField(
        max_length=256,
        default=settings.DEFAULT_FROM_EMAIL,
        default=get_default_from_email,
        verbose_name="nadawca wiadomości",
        help_text=f"rekomendowany: {settings.DEFAULT_FROM_EMAIL}",
    )

    batch_size = models.IntegerField(
        default=settings.EMAIL_BATCH_SIZE,
        default=get_email_batch_size,
        verbose_name="liczba wiadomości w pojedynczym pakiecie",
        help_text=f"Rekomendowana: {settings.EMAIL_BATCH_SIZE}",
    )

    def __str__(self):

mails/views.py

deleted100644 → 0
+0 −1
Changes for mails/views.py: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
# Create your views here.