From c32511927e934802eab022f543e5b2a36ab94c31 Mon Sep 17 00:00:00 2001 From: Edward <9326037+edwardoliveira@users.noreply.github.com> Date: Wed, 14 Oct 2026 11:00:44 -0300 Subject: [PATCH] =?UTF-8?q?Restaura=20imports=20perdidos=20na=20resolu?= =?UTF-8?q?=C3=A7=C3=A3o=20de=20conflitos=20de=20#3849/#3855=20(#3867)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - painel/urls.py: volta a importar votante_status (adicionado em #3855), perdido ao reescrever o import em #3849; causava NameError na inicialização. - sessao/views.py: importa Prefetch, usado pelos querysets de #3849 mas ausente após o merge; quebrava as listagens de Ordem do Dia/Expediente. Co-authored-by: Claude Opus 5.5 --- sapl/painel/urls.py | 3 ++- sapl/sessao/views.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sapl/painel/urls.py b/sapl/painel/urls.py index 95745cf27..ef592bd3f 100644 --- a/sapl/painel/urls.py +++ b/sapl/painel/urls.py @@ -2,7 +2,8 @@ from django.conf.urls import url from .apps import AppConfig from .views import (cronometro_painel, get_dados_painel, painel_view, - switch_painel, verifica_painel, votante_view) + switch_painel, verifica_painel, votante_status, + votante_view) app_name = AppConfig.name diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index 4c6b84a5a..2910f4b7f 100755 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -10,7 +10,7 @@ from django.contrib.auth.decorators import permission_required from django.contrib.auth.mixins import PermissionRequiredMixin from django.core.exceptions import ObjectDoesNotExist from django.db import IntegrityError, transaction -from django.db.models import Max, Q +from django.db.models import Max, Prefetch, Q from django.http import JsonResponse from django.http.response import Http404, HttpResponseRedirect from django.urls import reverse