From 08a3791fe1368da3286367407e01a7c1a0a460da Mon Sep 17 00:00:00 2001
From: "daniel.zauli" <daniel.zauli@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 7 Oct 2015 21:17:48 +0000
Subject: [PATCH] FIXES BUG #6710

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@48770 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../controladores/catalogos/EditarEscolaController.java  | 9 ++++++---
 web/gui/catalogos/editarEscola.zul                       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java
index 7d20a65a6..cbf38f163 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Controller;
 import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Messagebox;
@@ -62,7 +63,7 @@ public class EditarEscolaController extends MyGenericForwardComposer {
 	}
 
 	public void onClick$btnSalvar(Event ev) throws InterruptedException {
-		cmbCiudad.getValue(true);
+		cmbCiudad.getValue();
 	
 		try {
 			escola.setActivo(Boolean.TRUE);
@@ -86,7 +87,7 @@ public class EditarEscolaController extends MyGenericForwardComposer {
 					}
 				}
 			}
-
+			cmbCiudad.getValue(escola.getCiudad() == null);
 			if (podeSalvar) {
 				if (escola.getEscolaId() == null) {
 					EscolaService.suscribir(escola);
@@ -108,7 +109,9 @@ public class EditarEscolaController extends MyGenericForwardComposer {
 						Messagebox.OK, Messagebox.EXCLAMATION);
 			}
 
-		} catch (Exception ex) {
+		}catch(WrongValueException e){
+        	throw e;
+        } catch (Exception ex) {
 			log.error("editarEscolaController: " + ex);
 			Messagebox.show(
 					Labels.getLabel("MSG.Error"),
diff --git a/web/gui/catalogos/editarEscola.zul b/web/gui/catalogos/editarEscola.zul
index f7d052f2e..0c8a19eb6 100644
--- a/web/gui/catalogos/editarEscola.zul
+++ b/web/gui/catalogos/editarEscola.zul
@@ -6,7 +6,7 @@
 
 <zk>
 	<window id="winEditarEscola" border="normal"
-		apply="${editarEscolaController}" width="550px" height="245px"
+		apply="${editarEscolaController}" width="550px" height="122px"
 		contentStyle="overflow:auto"
 		title="${c:l('editarEscolaController.window.title')}">
 		<toolbar>