From 89f2ce162e97ec6d6b9e72b7cd52ac4d31e1d3e1 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 31 Mar 2014 13:00:42 +0000 Subject: [PATCH] =?UTF-8?q?Configura=C3=A7=C3=A3o=20de=20Bloqueio=20por=20?= =?UTF-8?q?Ag=C3=AAncia=20-=20colocar=20como=20default=20o=20campo=20todos?= =?UTF-8?q?=20(fixed=20bug=20#5064)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@34460 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../EditarConfRestricaoCanalVentaController.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java index f9f8f796c..529bcff67 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java @@ -27,6 +27,7 @@ import com.rjconsultores.ventaboletos.exception.BusinessException; import com.rjconsultores.ventaboletos.service.ConfRestricaoCanalVentaService; import com.rjconsultores.ventaboletos.service.ConfRestricaoExcecaoService; import com.rjconsultores.ventaboletos.service.ConfRestricaoPtovtaService; +import com.rjconsultores.ventaboletos.service.PuntoVentaService; import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @@ -49,9 +50,8 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom private RutaService rutaService; @Autowired private ConfRestricaoExcecaoService confRestricaoExcecaoServide; - @Autowired - ConfRestricaoPtovtaService confRestricaoPtovtaService; + private ConfRestricaoPtovtaService confRestricaoPtovtaService; private ConfRestricaoCanalVenta confRestricaoCanalVenta; private List lsTipoPtoVta; @@ -96,6 +96,12 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom if (confRestricaoCanalVenta.getConfRestricaoCanalVentaId() == null) { btnApagar.setVisible(Boolean.FALSE); + + List lsPtovta = new ArrayList(); + lsPtovta.add(confRestricaoPtovtaService.obtenerPtovtaTodos()); + confRestricaoCanalVenta.setLsConfRestricaoPtovta(lsPtovta); + confRestricaoPtovtaDataList.setData(lsPtovta); + } else { confRestricaoCanalVenta = confRestricaoCanalVentaService.obtenerID(confRestricaoCanalVenta.getConfRestricaoCanalVentaId()); excecaoDataList.setData(confRestricaoCanalVenta.getLsConfRestricaoExcecao()); @@ -132,12 +138,16 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom confRestricaoCanalVenta.setTipoPuntoVenta(null); } - if (cmbPuntoVenta.getSelectedItem() == null) { + if (confRestricaoCanalVenta.getLsConfRestricaoPtovta().isEmpty()) { Messagebox.show( Labels.getLabel("editarConfRestricaoCanalVentaController.MSG.restricaoPtovta"), Labels.getLabel("editarConfRestricaoCanalVentaController.window.title"), Messagebox.OK, Messagebox.INFORMATION); return; + } else { + for (ConfRestricaoPtovta cre : confRestricaoCanalVenta.getLsConfRestricaoPtovta()) { + cre.setConfRestricaoCanalVenta(confRestricaoCanalVenta); + } } confRestricaoCanalVentaService.suscribirActualizar(confRestricaoCanalVenta);