Merge pull request 'fixes bug#AL-3548' (!333) from AL-3548 into master
Reviewed-on: adm/VentaBoletosAdm#333 Reviewed-by: fabio <fabio.faria@rjconsultores.com.br> Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>master 1.34.14
commit
3d7dd5a42d
2
pom.xml
2
pom.xml
|
@ -4,7 +4,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>br.com.rjconsultores</groupId>
|
<groupId>br.com.rjconsultores</groupId>
|
||||||
<artifactId>ventaboletosadm</artifactId>
|
<artifactId>ventaboletosadm</artifactId>
|
||||||
<version>1.34.13</version>
|
<version>1.34.14</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
|
@ -208,6 +208,7 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
|
||||||
List<ConfRestricaoPtovta> lsPtovta = new ArrayList<ConfRestricaoPtovta>();
|
List<ConfRestricaoPtovta> lsPtovta = new ArrayList<ConfRestricaoPtovta>();
|
||||||
lsPtovta.add(confRestricaoPtovtaService.obtenerPtovtaTodos());
|
lsPtovta.add(confRestricaoPtovtaService.obtenerPtovtaTodos());
|
||||||
confRestricaoCanalVenta.setLsConfRestricaoPtovta(lsPtovta);
|
confRestricaoCanalVenta.setLsConfRestricaoPtovta(lsPtovta);
|
||||||
|
confRestricaoCanalVenta.setLsConfRestricaoTramo(lsConfRestricaoTramo);
|
||||||
confRestricaoPtovtaDataList.setData(lsPtovta);
|
confRestricaoPtovtaDataList.setData(lsPtovta);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -483,7 +484,7 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if(confRestricaoCanalVenta.getLsConfRestricaoTramo().isEmpty()) {
|
if(confRestricaoCanalVenta.getLsConfRestricaoTramo() != null && confRestricaoCanalVenta.getLsConfRestricaoTramo().isEmpty()) {
|
||||||
Messagebox.show(
|
Messagebox.show(
|
||||||
Labels.getLabel("editarConfRestricaoCanalVentaController.MSG.semTramosSelecionados"),
|
Labels.getLabel("editarConfRestricaoCanalVentaController.MSG.semTramosSelecionados"),
|
||||||
Labels.getLabel("editarConfRestricaoCanalVentaController.window.title"),
|
Labels.getLabel("editarConfRestricaoCanalVentaController.window.title"),
|
||||||
|
|
Loading…
Reference in New Issue