From c7bed37c206f114410174d02b64ff804df927cf8 Mon Sep 17 00:00:00 2001 From: Frederico Camargo Date: Tue, 20 May 2025 11:24:54 -0300 Subject: [PATCH 1/3] =?UTF-8?q?CDP-537=20Adicionar=20descriptive=20field?= =?UTF-8?q?=20entre=20os=20campos=20pass=C3=ADveis=20de=20exporta=C3=A7?= =?UTF-8?q?=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/functions/exportar.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/functions/exportar.php b/app/functions/exportar.php index 67b5311..980948f 100644 --- a/app/functions/exportar.php +++ b/app/functions/exportar.php @@ -61,7 +61,7 @@ function add_to_csv($pr_file, $pa_itens_listagem, $pb_adicionar_cabecalho = fals $va_atributos[] = $va_item_listagem["id_field"] ?? ""; $va_atributos[] = $va_item_listagem["main_field"] ?? ""; - /*$va_atributos[] = $va_item_listagem["descriptive_field"] ?? "";*/ + $va_atributos[] = $va_item_listagem["descriptive_field"] ?? ""; foreach($va_item_listagem["atributos"] as $va_atributos_item_listagem) { @@ -85,7 +85,7 @@ function create_header($pr_file, $pa_itens_listagem) $va_labels[] = $va_item_listagem["id_field_label"] ?? ""; $va_labels[] = $va_item_listagem["main_field_label"] ?? ""; - /*$va_labels[] = $va_item_listagem["descriptive_field_label"] ?? "";*/ + $va_labels[] = $va_item_listagem["descriptive_field_label"] ?? ""; foreach($va_item_listagem["atributos"] as $key => $va_atributos_item_listagem) { From 89ed6b328a9e8bf2fd2914ef257bb6642a371a39 Mon Sep 17 00:00:00 2001 From: Matheus Date: Tue, 3 Jun 2025 09:22:54 -0300 Subject: [PATCH 2/3] IG-67 Corrigir warning de acesso a key inexistente em autenticar_usuario --- app/functions/autenticar_usuario.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/functions/autenticar_usuario.php b/app/functions/autenticar_usuario.php index 7cb2491..5b0f508 100644 --- a/app/functions/autenticar_usuario.php +++ b/app/functions/autenticar_usuario.php @@ -97,7 +97,7 @@ if (isset($va_recurso_sistema["recurso_sistema_nome_plural"])) $vs_recurso_sistema_nome_plural = $va_recurso_sistema["recurso_sistema_nome_plural"]; - if (isset($va_recurso_sistema["recurso_sistema_genero_gramatical_codigo"])) + if (isset($va_recurso_sistema["recurso_sistema_genero_gramatical_codigo"]["genero_gramatical_codigo"])) $vn_recurso_sistema_genero_gramatical_codigo = $va_recurso_sistema["recurso_sistema_genero_gramatical_codigo"]["genero_gramatical_codigo"]; } From ff5a444eb140e9d28615c3e0aa9418f63d143126 Mon Sep 17 00:00:00 2001 From: Matheus Date: Tue, 3 Jun 2025 09:25:18 -0300 Subject: [PATCH 3/3] =?UTF-8?q?IG-171=20Ativar=20usu=C3=A1rio=20ao=20salva?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/system/usuario_base.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/system/usuario_base.php b/src/lib/system/usuario_base.php index d362fe5..ad530cf 100644 --- a/src/lib/system/usuario_base.php +++ b/src/lib/system/usuario_base.php @@ -211,6 +211,9 @@ public function salvar($pa_valores, $pb_logar_operacao = true, $pn_idioma_codigo if (isset($pa_valores["usuario_alterar_senha"]) && ($pa_valores["usuario_alterar_senha"])) $pa_valores["usuario_senha"] = password_hash($pa_valores["usuario_senha"], PASSWORD_DEFAULT); + if (!isset($pa_valores["usuario_ativo"])) + $pa_valores["usuario_ativo"] = 1; + return parent::salvar($pa_valores, $pb_logar_operacao, $pn_idioma_codigo, true, "", $pb_sobrescrever); }