From 3908a60b766c854b062a6c67015821def3258f56 Mon Sep 17 00:00:00 2001
From: Bruno Nocera Zanette <brunonzanette@gmail.com>
Date: Tue, 30 Sep 2014 15:16:35 -0300
Subject: [PATCH] Allow users to access Edit/Remove for Candidatos
Allow users to access Edit/Remove for Candidatos
---
.../c3sl/estacaojuventude/web/LocalizacaoController.java | 6 ++++++
.../web/OcorrenciaMunicipalController.java | 6 ++++++
.../ufpr/c3sl/estacaojuventude/web/ProgramaController.java | 7 +++++++
src/main/webapp/WEB-INF/views/localizacoes/list.jspx | 2 +-
.../webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx | 2 +-
src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx | 2 +-
src/main/webapp/WEB-INF/views/programas/list.jspx | 2 +-
7 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java
index 27b177a..17e3f71 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/LocalizacaoController.java
@@ -121,6 +121,12 @@ public class LocalizacaoController {
} else {
uiModel.addAttribute("localizacoes", Localizacao.findAllLocalizacoesEfetivos());
}
+
+ if (SecurityContextHolder.getContext().getAuthentication().getAuthorities().toArray()[0].toString().equals("Usuario")){
+ uiModel.addAttribute("delete", false);
+ uiModel.addAttribute("update", false);
+ }
+
return "localizacoes/list";
}
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 0b7c250..c8826de 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/OcorrenciaMunicipalController.java
@@ -372,6 +372,12 @@ public class OcorrenciaMunicipalController {
} else {
uiModel.addAttribute("ocorrenciamunicipais", OcorrenciaMunicipal.findAllOcorrenciasEfetivos());
}
+
+ if (SecurityContextHolder.getContext().getAuthentication().getAuthorities().toArray()[0].toString().equals("Usuario")){
+ uiModel.addAttribute("delete", false);
+ uiModel.addAttribute("update", false);
+ }
+
return "ocorrenciamunicipais/list";
}
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 1e5006f..f7a6f64 100644
--- a/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
+++ b/src/main/java/br/ufpr/c3sl/estacaojuventude/web/ProgramaController.java
@@ -324,7 +324,14 @@ public class ProgramaController {
} else {
uiModel.addAttribute("programas", Programa.findAllProgramasEfetivos());
}
+
addDateTimeFormatPatterns(uiModel);
+
+ if (SecurityContextHolder.getContext().getAuthentication().getAuthorities().toArray()[0].toString().equals("Usuario")){
+ uiModel.addAttribute("delete", false);
+ uiModel.addAttribute("update", false);
+ }
+
return "programas/list";
}
diff --git a/src/main/webapp/WEB-INF/views/localizacoes/list.jspx b/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
index 6fa194a..5f34df0 100644
--- a/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
+++ b/src/main/webapp/WEB-INF/views/localizacoes/list.jspx
@@ -17,7 +17,7 @@
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_Localizacao" items="${localizacoes}" z="e3STKf8oW/0oqDr/KihOxpAlGBY=">
- <table:table data="${localizacoes}" delete="false" id="l_br_ufpr_c3sl_estacaojuventude_Localizacao" path="/localizacoes" create="true" update="false" z="LCLLP2BD/iSyYc+oJVBSMRvXM+Q=">
+ <table:table data="${localizacoes}" id="l_br_ufpr_c3sl_estacaojuventude_Localizacao" path="/localizacoes" create="true" z="LCLLP2BD/iSyYc+oJVBSMRvXM+Q=">
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia" label="Programa" property="ocorrencia.programaVinculado" z="user-managed"/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_ocorrencia_municipios" label="Municípios" property="ocorrencia.municipios" z="user-managed"/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Localizacao_local" property="local" z="xSJytVXDQ3YxHNNm+4W+rn8r5o4="/>
diff --git a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx
index 7f8b27c..e20b222 100644
--- a/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx
+++ b/src/main/webapp/WEB-INF/views/ocorrenciamunicipais/list.jspx
@@ -16,7 +16,7 @@
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" items="${ocorrenciamunicipais}" z="/8eqEnisjTYrkLUxsp1MkQSOd70=">
- <table:table data="${ocorrenciamunicipais}" delete="false" id="l_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" path="/ocorrenciamunicipais" create="true" update="false" z="nx4hXF5YDAHxgnvLIUmDxMQLGYM=">
+ <table:table data="${ocorrenciamunicipais}" id="l_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal" path="/ocorrenciamunicipais" create="true" 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_orgaosExecutores" property="orgaosExecutores" z="vvHN30vTN2locaAdFWuvUjsGCL4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OcorrenciaMunicipal_beneficiosLocais" property="beneficiosLocais" z="hKB6zObru6eu8Gzg4JBnb9dJD5o="/>
diff --git a/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx b/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx
index ccfbb5a..aabcefe 100644
--- a/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx
+++ b/src/main/webapp/WEB-INF/views/orgaoexecutores/list.jspx
@@ -17,7 +17,7 @@
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" items="${orgaoexecutors}" z="Z75Wq7FKUsUQ4WyEoWMeHCLz8kc=">
- <table:table data="${orgaoexecutors}" id="l_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" path="/orgaoexecutores" create="true" update="false" delete="false" z="77kvkW0OLjM9ozefcO8lyVZcE7k=">
+ <table:table data="${orgaoexecutors}" id="l_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor" path="/orgaoexecutores" create="true" z="77kvkW0OLjM9ozefcO8lyVZcE7k=">
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_nome" property="nome" z="Nb1HHrIB4nT34G5ENgbZ4P1B7Yc="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_sigla" property="sigla" z="OdynEuYFIhbss8UVfHuegrmoXbg="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_OrgaoExecutor_site" property="site" z="fi4sWOmLlqPfWJlWyeBGNMBJSIY="/>
diff --git a/src/main/webapp/WEB-INF/views/programas/list.jspx b/src/main/webapp/WEB-INF/views/programas/list.jspx
index c95e28c..77062ee 100644
--- a/src/main/webapp/WEB-INF/views/programas/list.jspx
+++ b/src/main/webapp/WEB-INF/views/programas/list.jspx
@@ -16,7 +16,7 @@
</sec:authorize>
<sec:authorize ifAnyGranted="Usuario">
<page:list id="pl_br_ufpr_c3sl_estacaojuventude_Programa" items="${programas}" z="B8CCc5jnOG11TnnNHsgO+RDZkMk=">
- <table:table data="${programas}" delete="false" id="l_br_ufpr_c3sl_estacaojuventude_Programa" path="/programas" pathShow="programas" create="true" update="false" z="06VH5QO9Vmyrhv1svwadlxDy9GI=">
+ <table:table data="${programas}" id="l_br_ufpr_c3sl_estacaojuventude_Programa" path="/programas" pathShow="programas" create="true" z="06VH5QO9Vmyrhv1svwadlxDy9GI=">
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeOficial" property="nomeOficial" z="mC47sSfN3JWHRGKSfNo+cZyzSb4="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Programa_nomeDivulgacao" property="nomeDivulgacao" z="BishAdlprYQHAyGK6PL9ZMaFFCA="/>
<table:column id="c_br_ufpr_c3sl_estacaojuventude_Programa_sigla" property="sigla" z="n/jlqMTQnkDToVlF0Lr7v2GzDM8="/>
--
GitLab