fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes Bug #0010492 - Code review feito pelo Daniel e testes pelo Renato 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@78375 d1611594-4594-4d17-8e1d-87c2c4800839
master
alexandre.lima 2018-01-26 12:46:43 +00:00
parent 4338fd05f9
commit 4f330d6f9e
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java
View File

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Properties;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
@ -47,6 +48,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfRestricaoPt
public class EditarConfRestricaoCanalVentaController extends MyGenericForwardComposer { public class EditarConfRestricaoCanalVentaController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static Properties p = new Properties();
@Autowired @Autowired
private ConfRestricaoCanalVentaService confRestricaoCanalVentaService; private ConfRestricaoCanalVentaService confRestricaoCanalVentaService;
@Autowired @Autowired
@ -99,6 +101,11 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
if (!"1".equals(p.getProperty("puntoVenta.validaCtaCteEmpresa", "1"))) {
cmbEmpresa.setConstraint("no empty");
}
confRestricaoCanalVenta = (ConfRestricaoCanalVenta) Executions.getCurrent().getArg().get("confRestricaoCanalVenta"); confRestricaoCanalVenta = (ConfRestricaoCanalVenta) Executions.getCurrent().getArg().get("confRestricaoCanalVenta");
confRestricaoCanalVentaList = (MyListbox) Executions.getCurrent().getArg().get("confRestricaoCanalVentaList"); confRestricaoCanalVentaList = (MyListbox) Executions.getCurrent().getArg().get("confRestricaoCanalVentaList");
@ -244,6 +251,12 @@ public class EditarConfRestricaoCanalVentaController extends MyGenericForwardCom
} }
} }
if ("1".equals(p.getProperty("puntoVenta.validaCtaCteEmpresa", "1")) && cmbEmpresa.getSelectedItem() == null) {
Empresa empresa = new Empresa();
empresa.setEmpresaId(-1);
confRestricaoCanalVenta.setEmpresa(empresa);
}
confRestricaoCanalVentaService.suscribirActualizar(confRestricaoCanalVenta); confRestricaoCanalVentaService.suscribirActualizar(confRestricaoCanalVenta);
confRestricaoCanalVentaList.updateItem(confRestricaoCanalVenta); confRestricaoCanalVentaList.updateItem(confRestricaoCanalVenta);

1
web/gui/esquema_operacional/editarConfRestricaoCanalVenta.zul
View File

@ -93,7 +93,6 @@
<combobox id="cmbEmpresa" <combobox id="cmbEmpresa"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
mold="rounded" buttonVisible="true" width="60%" mold="rounded" buttonVisible="true" width="60%"
constraint="no empty"
selectedItem="@{winEditarConfRestricaoCanalVenta$composer.confRestricaoCanalVenta.empresa}" selectedItem="@{winEditarConfRestricaoCanalVenta$composer.confRestricaoCanalVenta.empresa}"
model="@{winEditarConfRestricaoCanalVenta$composer.lsEmpresa}" /> model="@{winEditarConfRestricaoCanalVenta$composer.lsEmpresa}" />
</row> </row>