From d19143760856d776e87f21b1e95ce8f27dd8c88e Mon Sep 17 00:00:00 2001
From: Fabiano Sluzarski <fs09@inf.ufpr.br>
Date: Mon, 31 Mar 2014 14:36:34 -0300
Subject: [PATCH] adicionado componete de multipla selecao funcionando na tela
 de update

---
 .../web/OcorrenciaMunicipalController.java         | 14 ++++++++++----
 .../estacaojuventude/web/ProgramaController.java   | 12 +++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
index dfa2189..1383b82 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
@@ -70,12 +70,18 @@ public class OcorrenciaMunicipalController {
 			ocorrenciaMunicipalGlobal.setOrgaosExecutores(orgaosExecutoresNovo);
 		}
 		populateEditForm(uiModel, ocorrenciaMunicipalGlobal);
-		ocorrenciaMunicipalGlobal = null;
-		return "ocorrenciamunicipais/create";
+		if (ocorrenciaMunicipalGlobal.getId() == null) {
+			ocorrenciaMunicipalGlobal = null;
+			return "ocorrenciamunicipais/create";
+		}
+		else {
+			ocorrenciaMunicipalGlobal = null;
+			return "ocorrenciamunicipais/update";
+		}
 	}
 	
-	@RequestMapping(value = "selecionar", method = RequestMethod.POST, produces = "text/html")
-    public String createSelectForm(@Valid OcorrenciaMunicipal ocorrenciaMunicipal, @RequestParam(value = "tipo", required = false) String type, @RequestParam(value = "op", required = false) Integer op, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+	@RequestMapping(value = "selecionar", method = {RequestMethod.POST, RequestMethod.PUT}, produces = "text/html")
+    public String selectForm(@Valid OcorrenciaMunicipal ocorrenciaMunicipal, @RequestParam(value = "tipo", required = false) String type, @RequestParam(value = "op", required = false) Integer op, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
 		ocorrenciaMunicipalGlobal = ocorrenciaMunicipal;
 		
 		if (op == 0) {
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
index 1b5beb7..5375155 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
@@ -101,11 +101,17 @@ public class ProgramaController {
 			programaGlobal.setOrgaosExecutores(orgaosExecutoresNovo);
 		}
 		populateEditForm(uiModel, programaGlobal);
-		programaGlobal = null;
-		return "programas/create";
+		if (programaGlobal.getId() == null) {
+			programaGlobal = null;
+			return "programas/create";
+		}
+		else {
+			programaGlobal = null;
+			return "programas/update";
+		}
 	}
 	
-	@RequestMapping(value = "selecionar", method = RequestMethod.POST, produces = "text/html")
+	@RequestMapping(value = "selecionar", method = {RequestMethod.POST, RequestMethod.PUT}, produces = "text/html")
     public String createSelectForm(@Valid Programa programa, @RequestParam(value = "tipo", required = false) String type, @RequestParam(value = "op", required = false) Integer op, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
 		programaGlobal = programa;
 		
-- 
GitLab