Skip to content

Release v1.4.31 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mthsps merged 4 commits into from
Jun 3, 2025
Merged

Release v1.4.31 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7bed37
CDP-537 Adicionar descriptive field entre os campos passíveis de expo…
fredaccamargo May 20, 2025
ba91c0a
Merge branch 'main' into v1.4.31
mthsps Jun 3, 2025
89ed6b3
IG-67 Corrigir warning de acesso a key inexistente em autenticar_usuario
mthsps Jun 3, 2025
ff5a444
IG-171 Ativar usuário ao salvar
mthsps Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/functions/autenticar_usuario.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"];

}
Expand Down
4 changes: 2 additions & 2 deletions app/functions/exportar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down
3 changes: 3 additions & 0 deletions src/lib/system/usuario_base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Loading