From 6a1de14dd0f4cb95023f498c948da9e0bfb5bd17 Mon Sep 17 00:00:00 2001 From: wilian Date: Thu, 16 Jan 2020 20:22:40 +0000 Subject: [PATCH] fixes bug#17842 dev:fred qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@99784 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../web/utilerias/render/RenderHistoricoContingencia.java | 2 ++ web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + web/gui/seguridad/editarContingencia.zul | 5 ++++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderHistoricoContingencia.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderHistoricoContingencia.java index a4debc2b4..aacbf10e6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderHistoricoContingencia.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderHistoricoContingencia.java @@ -1,5 +1,6 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; +import org.zkoss.util.resource.Labels; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listitem; import org.zkoss.zul.ListitemRenderer; @@ -16,6 +17,7 @@ public class RenderHistoricoContingencia implements ListitemRenderer { LogHistoricoContingencia log = (LogHistoricoContingencia) o; configuraListCell(lstm, log.getMotivo()); + configuraListCell(lstm, log.getIndautomatica() ? Labels.getLabel("MSG.SI") : Labels.getLabel("MSG.NO")); configuraListCell(lstm, log.getUsuario().getUsuarioId() + " - " + log.getUsuario().getName()); configuraListCell(lstm, DateUtil.getStringDateHour(log.getDataHora())); configuraListCell(lstm, EAmbienteContingencia.getAmbienteContingencia(log.getAmbiente()).getDescricao()); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index c123b6b32..8f0e88f2b 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -8308,6 +8308,7 @@ editarContigencia.tabela.usuario=USUARIO editarContigencia.tabela.data=DATA editarContigencia.tabela.ambiente=Ambiente editarContigencia.tabela.status=STATUS +editarContigencia.tabela.automatica=AUTOMATICA indexController.mniTrocoSimples.label= Troco Simples indexController.mniTrocoSimples.cadastroEmpresa.label= Cadastro Empresa diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index ba2d3e370..a7bf51d20 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -8813,6 +8813,7 @@ editarContigencia.tabela.usuario=USUARIO editarContigencia.tabela.data=DATA editarContigencia.tabela.ambiente=Ambiente editarContigencia.tabela.status=STATUS +editarContigencia.tabela.automatica=AUTOMÁTICA #Troco Simples indexController.mniTrocoSimples.label= Troco Simples diff --git a/web/gui/seguridad/editarContingencia.zul b/web/gui/seguridad/editarContingencia.zul index c7131a32b..db7edf609 100644 --- a/web/gui/seguridad/editarContingencia.zul +++ b/web/gui/seguridad/editarContingencia.zul @@ -6,7 +6,7 @@ @@ -91,6 +91,9 @@ +