From f8cf47c205bd04d0c43a7fd7541034fa190646c4 Mon Sep 17 00:00:00 2001
From: Bruno Nocera Zanette <brunonzanette@gmail.com>
Date: Wed, 25 Jun 2014 15:16:50 -0300
Subject: [PATCH] Disable Estado-Municipios options [Fix bugs]
Disable Estado-Municipios options [Fix bugs]
---
.../ufpr/c3sl/estacaojuventude/web/ProgramaController.java | 7 ++++---
src/main/webapp/WEB-INF/views/localizacoes/update.jspx | 2 ++
.../webapp/WEB-INF/views/ocorrenciamunicipais/mylist.jspx | 2 +-
.../webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx | 2 +-
.../webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx | 2 ++
src/main/webapp/WEB-INF/views/programas/update.jspx | 4 ++--
6 files changed, 12 insertions(+), 7 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 12e705b..e170189 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
@@ -42,7 +42,8 @@ import br.ufpr.c3sl.estacaojuventude.enums.TipoTemporalidade;
@SessionAttributes( { "programa", "create" })
@Controller
@RooWebScaffold(path = "programas", formBackingObject = Programa.class)
-public class ProgramaController {
+public class ProgramaController {
+ // este atributo, com funcionamento do tipo "global", devera ser refatorado
private Programa programaGlobal;
private int getIndexTematica(Tematica tematica, List<Tematica> tematicas){
@@ -461,11 +462,11 @@ public class ProgramaController {
@RequestMapping(value = "pesquisa", method = RequestMethod.GET)
public String searchProgramas(@Valid Programa programa, Model uiModel) {
- if((Boolean)uiModel.asMap().get("create")){
+ if((Boolean)uiModel.asMap().get("create") || programa == null){
programa = new Programa();
uiModel.addAttribute("programa", new Programa());
uiModel.addAttribute("create", false);
- }
+ }
//System.out.println("\n\n");
//System.out.println(":tematicas: "+tematicas+" :nomeOficial: "+nomeOficial+" :nomeMunicipio: "+nomeMunicipio);
//System.out.println("\n\n");
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/update.jspx b/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
index ed709c4..b9574a0 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/update.jspx
@@ -22,6 +22,8 @@
<field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:datetime dateTimePattern="${localizacao_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ultimaAlteracao" render="false" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_observacao" z="user-managed"/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_status" items="${tipostatuses}" path="tipostatuses" z="TEwrKKSHtWZlxHF78UJ71aVsuQs="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="wmo7IEAN0Eh+oOhrkuA9jfhDQnw="/>
</form:update>
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/mylist.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/mylist.jspx
index 6d41c80..ada5606 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/mylist.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/mylist.jspx
@@ -5,7 +5,7 @@
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" items="${ocorrenciamunicipais}" z="/8eqEnisjTYrkLUxsp1MkQSOd70=">
<table:table data="${ocorrenciamunicipais}" id="l_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" path="/ocorrenciamunicipais" z="nx4hXF5YDAHxgnvLIUmDxMQLGYM=">
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" property="programaVinculado" z="Tm+iykUft/VEdMGXSaVnnBzsJE0="/>
- <table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" property="municipio" z="cQGkxw226ouNjy7A6uvXxHYtxr4="/>
+ <table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" property="municipios" z="cQGkxw226ouNjy7A6uvXxHYtxr4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" property="orgaosExecutores" z="vvHN30vTN2locaAdFWuvUjsGCL4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" property="beneficiosLocais" z="hKB6zObru6eu8Gzg4JBnb9dJD5o="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" property="comoAcessar" z="m0b/EHguMPNIm1Zmv6odJ9EE8Uw="/>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx
index 82c6d03..1bc5aca 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/myshow.jspx
@@ -4,7 +4,7 @@
<jsp:output omit-xml-declaration="yes"/>
<page:show id="ps_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" object="${ocorrenciamunicipal}" path="/ocorrenciamunicipais" list="false" z="WHPSs3ZdcAYSs9In0j1we/+ggfA=">
<field:display field="programaVinculado" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_programaVinculado" object="${ocorrenciamunicipal}" z="ClfjWWF7bqxVvh1iaAUUlR/bSzU="/>
- <field:display field="municipio" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipio" object="${ocorrenciamunicipal}" z="3GnqSLiyHDjCiiuRGpGGczgguns="/>
+ <field:display field="municipios" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" object="${ocorrenciamunicipal}" z="3GnqSLiyHDjCiiuRGpGGczgguns="/>
<field:display field="orgaosExecutores" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_orgaosExecutores" object="${ocorrenciamunicipal}" z="1xYJwVmetGkSz0P1On1Besffdps="/>
<field:display field="beneficiosLocais" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" object="${ocorrenciamunicipal}" z="ygvEccTRGhbXXLHbIO1Rj7zwFYE="/>
<field:display field="comoAcessar" id="s_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_comoAcessar" object="${ocorrenciamunicipal}" z="xLwQzw4LFz+zSUcRQfcSYTkflPw="/>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
index a54a41d..1e95dd1 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/update.jspx
@@ -21,6 +21,8 @@
<field:datetime dateTimePattern="${ocorrenciaMunicipal_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_ultimaAlteracao" render="false" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_observacao" z="user-managed"/>
<field:select field="municipios" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_municipios" itemValue="id" items="${municipios}" multiple="true" path="/municipios" z="BD05YnRdtdU25XgKJrSAq3Mc+f4="/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_status" items="${tipostatuses}" path="tipostatuses" z="F0r/fUzTX6lkoHa0mAWk5JT7EF8="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="Babmxc8XdBqVIn8xbkYKIAy+glA="/>
</form:update>
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
diff --git a/src/main/webapp/WEB-INF/views/programas/update.jspx b/src/main/webapp/WEB-INF/views/programas/update.jspx
index 303130d..9a673aa 100644
--- a/src/main/webapp/WEB-INF/views/programas/update.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/update.jspx
@@ -29,10 +29,11 @@
<field:textarea field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="user-managed"/>
<!-- <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> -->
<field:select disabled="true" field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" path="/ocorrenciamunicipais" z="user-managed"/>
-
<field:select field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="user-managed"/>
<field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="user-managed"/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_observacao" z="user-managed"/>
+ <field:select field="status" id="c_br_ufpr_c3sl_estacaojuventude_Programa_status" items="${tipostatuses}" path="tipostatuses" z="TWynnY2LlkTLv9vJJ6PYF11yQk0="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_estacaojuventude_Programa_usuario" itemValue="id" items="${usuarios}" path="/usuarios" z="gyBHEGJXuWI8xAN+JR0Z6EVyhMY="/>
</form:update>
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
@@ -62,7 +63,6 @@
<field:textarea field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/>
<!-- <field:input field="parceiros" id="c_br_ufpr_c3sl_estacaojuventude_Programa_parceiros" z="Jbi+j14QiuxyUynDmEoZrpR6n1Q="/> -->
<field:select disabled="true" field="ocorrencias" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ocorrencias" itemValue="id" items="${ocorrenciamunicipais}" multiple="true" path="/ocorrenciamunicipais" render="false" z="user-managed"/>
-
<field:select disabled="true" field="situacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_situacao" items="${situacaos}" path="situacaos" widthcss="60px" z="jCGDX8PAVbMAynepL96G296Jlxw="/>
<field:datetime dateTimePattern="${programa_ultimaalteracao_date_format}" field="ultimaAlteracao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_ultimaAlteracao" render="false" z="e3c4w4glZu09OLB7kWuvESpucp4="/>
<field:textarea field="observacao" id="c_br_ufpr_c3sl_estacaojuventude_Programa_observacao" z="pwr4FRP1megERSCEyZJma2fystE="/>
--
GitLab