Commit 8b9f35ba authored by Joachim Kołodziejski's avatar Joachim Kołodziejski
Browse files

Merge voter 'first_name' and 'last_name' into 'name', store voter email... 

Merge voter 'first_name' and 'last_name' into 'name', store voter email instead of username and remove VOTERS_EMAIL_DOMAIN setting, add voter is_verified field (now unused), make MailStatus an integer enum, change some CharField  max lengths, fix last_token_mail_up_to_date logic, write a better group name syntax description, regenerate all migrations
parent 6c11d469

archive/admin.py

+3 −3
Changes for archive/admin.py: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ from django.shortcuts import render 
from .models import ArchivedVoter, ArchivedGroup



class ArchivedVoterAdmin(admin.ModelAdmin):

    list_display = ['first_name', 'last_name', 'username', 'group']

    list_display = ['name', 'email', 'group']

    exclude = ['token', 'token_generation_date', 'last_email_date', 'is_archived']

    search_fields = ['first_name', 'last_name', 'username']

    search_fields = ['name', 'email']

    list_filter = ['group']

    

    def get_search_results(self, request, queryset, search_term):

        queryset, use_distinct = super().get_search_results(request, queryset, search_term)

        

        if search_term:

            queryset = queryset.annotate(full_name=Concat('first_name', Value(' '), 'last_name')).filter(full_name__icontains=search_term) | queryset

            queryset |= queryset.annotate(full_name='name').filter(full_name__icontains=search_term)

            

        return queryset, use_distinct

archive/migrations/0001_initial.py

+21 −7
Changes for archive/migrations/0001_initial.py: 21 added lines, 7 removed lines.
Original line number Diff line number Diff line 
# Generated by Django 6.0.3 on 2026-03-25 23:36

# Generated by Django 6.0.3 on 2026-04-15 17:35



import django.db.models.deletion

from django.db import migrations, models

from django.db import migrations





class Migration(migrations.Migration):
@@ -9,18 +8,33 @@ class Migration(migrations.Migration): 
    initial = True



    dependencies = [

        ('voters', '0006_group_is_archived_voter_is_archived'),

        ('voters', '0001_initial'),

    ]



    operations = [

        migrations.CreateModel(

            name='ArchivedGroup',

            fields=[

            ],

            options={

                'verbose_name': 'zarchiwizowana klasa',

                'verbose_name_plural': 'zarchiwizowane klasy',

                'proxy': True,

                'indexes': [],

                'constraints': [],

            },

            bases=('voters.group',),

        ),

        migrations.CreateModel(

            name='ArchivedVoter',

            fields=[

                ('voter_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='voters.voter')),

            ],

            options={

                'verbose_name': 'Zarchiwizowany wyborca',

                'verbose_name_plural': 'Zarchiwizowani wyborcy',

                'verbose_name': 'zarchiwizowany wyborca',

                'verbose_name_plural': 'zarchiwizowani wyborcy',

                'proxy': True,

                'indexes': [],

                'constraints': [],

            },

            bases=('voters.voter',),

        ),

archive/migrations/0002_delete_archivedvoter_archivedvoter.py

deleted100644 → 0
+0 −30
Changes for archive/migrations/0002_delete_archivedvoter_archivedvoter.py: 0 added lines, 30 removed lines.
Original line number Diff line number Diff line 
# Generated by Django 6.0.3 on 2026-03-25 23:40



from django.db import migrations





class Migration(migrations.Migration):



    dependencies = [

        ('archive', '0001_initial'),

        ('voters', '0006_group_is_archived_voter_is_archived'),

    ]



    operations = [

        migrations.DeleteModel(

            name='ArchivedVoter',

        ),

        migrations.CreateModel(

            name='ArchivedVoter',

            fields=[

            ],

            options={

                'verbose_name': 'Zarchiwizowany wyborca',

                'verbose_name_plural': 'Zarchiwizowani wyborcy',

                'proxy': True,

                'indexes': [],

                'constraints': [],

            },

            bases=('voters.voter',),

        ),

    ]

archive/migrations/0003_alter_archivedvoter_options.py

deleted100644 → 0
+0 −17
Changes for archive/migrations/0003_alter_archivedvoter_options.py: 0 added lines, 17 removed lines.
Original line number Diff line number Diff line 
# Generated by Django 6.0.3 on 2026-03-26 13:36



from django.db import migrations





class Migration(migrations.Migration):



    dependencies = [

        ('archive', '0002_delete_archivedvoter_archivedvoter'),

    ]



    operations = [

        migrations.AlterModelOptions(

            name='archivedvoter',

            options={'verbose_name': 'zarchiwizowany wyborca', 'verbose_name_plural': 'zarchiwizowani wyborcy'},

        ),

    ]

archive/migrations/0004_archivedgroup.py

deleted100644 → 0
+0 −27
Changes for archive/migrations/0004_archivedgroup.py: 0 added lines, 27 removed lines.
Original line number Diff line number Diff line 
# Generated by Django 6.0.3 on 2026-03-26 13:44



from django.db import migrations





class Migration(migrations.Migration):



    dependencies = [

        ('archive', '0003_alter_archivedvoter_options'),

        ('voters', '0006_group_is_archived_voter_is_archived'),

    ]



    operations = [

        migrations.CreateModel(

            name='ArchivedGroup',

            fields=[

            ],

            options={

                'verbose_name': 'zarchiwizowana klasa',

                'verbose_name_plural': 'zarchiwizowane klasy',

                'proxy': True,

                'indexes': [],

                'constraints': [],

            },

            bases=('voters.group',),

        ),

    ]