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 1/2] =?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 <noreply@anthropic.com>
---
 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

From c46a5a0c7c6230df99bc1f686294c27f9d4379f3 Mon Sep 17 00:00:00 2001
From: Edward Oliveira <edwardr@senado.gov.br>
Date: Wed, 14 Oct 2026 11:13:04 -0300
Subject: [PATCH 2/2] Release: 3.1.165-RC4

---
 CHANGES.md                 | 14 ++++++++++++++
 docker/docker-compose.yaml |  2 +-
 sapl/settings.py           |  2 +-
 sapl/templates/base.html   |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index efac508cd..eb37d3303 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,18 @@
 
+3.1.165-RC4 / 2026-10-14
+========================
+
+  * Restaura imports perdidos na resolução de conflitos de #3849/#3855 (#3867)
+  * Sanitiza HTML/JavaScript nos campos TextField (stored XSS) (#3846)
+  * Fix N+1 queries in sessão/relatórios and remove unused painel views (#3849)
+  * Corrige travas e concorrência na votação nominal do painel (#3855)
+  * Restringe acesso a arquivos de mídia (#3865)
+  * Converte títulos colados em parágrafos no editor de dispositivos (#3863)
+  * Permite ajustar e persistir o tamanho da letra no editor de textos articulados (#3862)
+  * Mantém visíveis ao público as sessões de hoje e de datas passadas (#3864)
+  * Melhorias de transparência (PNTP): correções de relatórios e novas funcionalidades (#3842)
+  * Impede presenças duplicadas de parlamentar na mesma sessão (#3850)
+
 3.1.165-RC3 / 2026-09-01
 ========================
 
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 46b5bd627..6f4e21780 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -33,7 +33,7 @@ services:
     networks:
       - sapl-net
   sapl:
-    image: interlegis/sapl:3.1.165-RC3
+    image: interlegis/sapl:3.1.165-RC4
 #    build:
 #      context: ../
 #      dockerfile: ./docker/Dockerfile
diff --git a/sapl/settings.py b/sapl/settings.py
index 9c9aa99c7..5936f0f23 100644
--- a/sapl/settings.py
+++ b/sapl/settings.py
@@ -43,7 +43,7 @@ ALLOWED_HOSTS = ['*']
 LOGIN_REDIRECT_URL = '/'
 LOGIN_URL = '/login/?next='
 
-SAPL_VERSION = '3.1.165-RC3'
+SAPL_VERSION = '3.1.165-RC4'
 
 if DEBUG:
     EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index e3582e2ef..37ec47f6d 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -207,7 +207,7 @@
                 <small>
                   Desenvolvido pelo <a href="http://www.interlegis.leg.br/">Interlegis</a> em software livre e aberto.
                 </small>
-		<span>Release: 3.1.165-RC3</span>
+		<span>Release: 3.1.165-RC4</span>
               </p>
 
             </div>