From aaaf170b1df059911bda4ac581d049135280d7b2 Mon Sep 17 00:00:00 2001
From: Daniel Vitor Ruiz <dvr13@inf.ufpr.br>
Date: Mon, 30 Jun 2014 15:03:34 -0300
Subject: [PATCH] Fix ProgramaSearch problem of inheriting tematicas of a
 unfinished programa

Signed-off-by: Daniel Vitor Ruiz <dvr13@inf.ufpr.br>
---
 .../estacaojuventude/web/ProgramaController.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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 1d9b47f..aa47301 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
@@ -280,6 +280,7 @@ public class ProgramaController {
     
     @RequestMapping(value = "/{id}", produces = "text/html")
     public String show(@PathVariable("id") Long id, Model uiModel) {
+
     	uiModel.addAttribute("create", true);
         Programa programa = Programa.findPrograma(id);
         addDateTimeFormatPatterns(uiModel);
@@ -462,11 +463,16 @@ public class ProgramaController {
     
     @RequestMapping(value = "pesquisa", method = RequestMethod.GET)
     public String searchProgramas(@Valid Programa programa, Model uiModel) {
-    	//if((Boolean)uiModel.asMap().get("create")){
-    	//	programa = new Programa();
-    	//	uiModel.addAttribute("programa", new Programa());
-    	//	uiModel.addAttribute("create", false);
-    	//}    	 
+    	
+    	if(!uiModel.asMap().containsKey("create")){
+    		uiModel.addAttribute("create", false);
+    	}
+    	
+    	if((Boolean)uiModel.asMap().get("create")){
+    		programa = new Programa();
+    		uiModel.addAttribute("programa", new Programa());
+    		uiModel.addAttribute("create", false);
+    	}    	 
     	
     	uiModel.addAttribute("tematicas", programa.getTematicas());
     	if (programa.getNomeOficial() != null)
-- 
GitLab