Commit 52c8f140 authored by Staś Kycia's avatar Staś Kycia
Browse files

removed is_verified flag from voter and fixed alias generation in election form

parent cba3ad6b
Loading
Loading
Loading
Loading
+0 −6
Changes for api/views.py: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ class ElectionListView(ListAPIView):
            voter = None
        if voter is None:
            raise PermissionDenied("Nieprawidłowy token uwierzytelniający!")
        if not voter.is_verified:
            raise PermissionDenied("Konto niezweryfikowane!")
        
        now = timezone.now()
        
@@ -55,8 +53,6 @@ class ElectionView(RetrieveAPIView):
            voter = None
        if voter is None:
            raise PermissionDenied("Nieprawidłowy token uwierzytelniający!")
        if not voter.is_verified:
            raise PermissionDenied("Konto niezweryfikowane!")
        
        election = super().get_object()
        if not election.is_active:
@@ -90,8 +86,6 @@ class VoteAPIView(APIView):
            voter = None
        if voter is None:
            raise PermissionDenied("Nieprawidłowy token uwierzytelniający!")
        if not voter.is_verified:
            raise PermissionDenied("Konto niezweryfikowane!")

        election = get_object_or_404(Election, alias=alias)
        
+1 −8
Changes for elections/admin.py: 1 added line, 8 removed lines.
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ class ElectionContributorInline(admin.TabularInline):
    classes = ['collapse']
    extra = 0
    
    # def get_readonly_fields(self, request, obj = None):
    #     if obj is None:
    #         return super().get_readonly_fields(request, obj)
    #     if obj.owner == request.user:
    #         return []
    #     return ['can_manage_permissions']
    
    def get_formset(self, request, obj = None, **kwargs):
        formset = super().get_formset(request, obj, **kwargs)
        old_init = formset.form.__init__
@@ -76,7 +69,7 @@ class ElectionAdmin(admin.ModelAdmin):
    exclude = ['invalid_votes', 'local_votes_entered', 'owner']
    inlines = (OptionInline, ElectionContributorInline)


    prepopulated_fields = {"alias": ("name",)}

    @admin.display(description="Aktywne", boolean=True)
    def is_active_status(self, obj):
+26 −0
Changes for elections/migrations/0008_alter_election_owner_and_more.py: 26 added lines, 0 removed lines.
Original line number Diff line number Diff line
# Generated by Django 6.0.3 on 2026-06-01 11:28

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

    dependencies = [
        ('elections', '0007_alter_election_owner'),
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
    ]

    operations = [
        migrations.AlterField(
            model_name='election',
            name='owner',
            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='owned_elections', to=settings.AUTH_USER_MODEL, verbose_name='Właściciel'),
        ),
        migrations.AlterField(
            model_name='electioncontributor',
            name='can_manage_permissions',
            field=models.BooleanField(default=False, help_text='Wymaga uprawnień do edycji', verbose_name='zarządzanie uprawnieniami'),
        ),
    ]
+1 −1
Changes for elections/models.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class Election(models.Model):
    allow_invalid = models.BooleanField(default=True, verbose_name='zezwalaj na głosy nieważne')
    invalid_votes = models.IntegerField(default=0, blank=False)
    
    alias = models.SlugField(unique=True, blank=True, allow_unicode=False, verbose_name='alias', help_text='Zostaw to pole puste, a alias zostanie wygenerowany na podstawie nazwy')
    alias = models.SlugField(unique=True, blank=True, allow_unicode=False, verbose_name='alias', help_text="Alias występuje w adresie URL danego głosowania.")
    
    always_visible = models.BooleanField(default=False, verbose_name='zawsze pokazuj na liście', help_text='Pokazuj głosowanie na liście dostępnych niezależnie od daty')
    
+0 −6
Changes for mails/tasks.py: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ def send_mail_batch_task(base_status=MailStatus.PENDING):
            queued_email.save()
            continue
          
        if queued_email.voter.is_verified == False:
            queued_email.status = MailStatus.ERROR
            queued_email.error_message = 'Wyborca nie jest zweryfikowany'
            queued_email.save()
            continue
          
        try:
            sending_status = email.send(fail_silently=False)
            if sending_status:
Loading