diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 8dadf0865ceccc92d79a33c9068d73702c518bb6..7eedaecc5bffac14c2d6622f38dfce583dfc4589 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,7 @@
-#Tue Feb 05 12:04:22 BRST 2013
+#Wed Feb 06 10:54:03 BRST 2013
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
+encoding//src/main/webapp/WEB-INF/i18n/application.properties=UTF-8
encoding//src/main/webapp/WEB-INF/i18n/messages.properties=UTF-8
encoding/<project>=UTF-8
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java b/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
index 7d7aac438cd806c3c7568d49fe627c57ade1c5f8..4d1a37990095eeb3bd793640ddaeb96013e4f53c 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Projeto.java
@@ -15,6 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.roo.addon.javabean.RooJavaBean;
import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
import org.springframework.roo.addon.tostring.RooToString;
+import org.springframework.security.core.context.SecurityContextHolder;
import br.ufpr.c3sl.participatorio.enums.TipoAcao;
import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
@@ -130,6 +131,8 @@ public class Projeto {
@Enumerated(EnumType.STRING)
private TipoStatus estado;
+ @OneToOne
+ private Usuario usuario;
public static List<Projeto> findAllProjetosCandidatos() {
return entityManager().createNativeQuery("SELECT * FROM Projeto WHERE estado = 'Candidato'", Projeto.class).getResultList();
@@ -142,4 +145,10 @@ public class Projeto {
public static List<Projeto> findAllProjetosRejeitados() {
return entityManager().createNativeQuery("SELECT * FROM Projeto WHERE estado = 'Rejeitado'", Projeto.class).getResultList();
}
+
+ public static List<Projeto> findMeusProjetos() {
+ String login = SecurityContextHolder.getContext().getAuthentication().getName();
+
+ return entityManager().createNativeQuery("SELECT * FROM Projeto p, Usuario u WHERE p.usuario = u.id and p.estado = 'Candidato' and u.login = '"+login+"'", Projeto.class).getResultList();
+ }
}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj b/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj
index b2da614a4faaa73f99a8433cbabcb9f3d11d1289..0bf1b8bac12b18a49baaa25e0d144d0cacf145a6 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Projeto_Roo_JavaBean.aj
@@ -5,6 +5,7 @@ package br.ufpr.c3sl.participatorio;
import br.ufpr.c3sl.participatorio.Ministerio;
import br.ufpr.c3sl.participatorio.Projeto;
+import br.ufpr.c3sl.participatorio.Usuario;
import br.ufpr.c3sl.participatorio.enums.TipoAcao;
import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
@@ -335,4 +336,12 @@ privileged aspect Projeto_Roo_JavaBean {
this.estado = estado;
}
+ public Usuario Projeto.getUsuario() {
+ return this.usuario;
+ }
+
+ public void Projeto.setUsuario(Usuario usuario) {
+ this.usuario = usuario;
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/Usuario.java b/src/main/java/br/ufpr/c3sl/participatorio/Usuario.java
index 66f1adcbf557fc84d6ad55e64d723d7accec954d..06056d455f1f399e71ad670a8bd6873db65879b3 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/Usuario.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/Usuario.java
@@ -1,5 +1,9 @@
package br.ufpr.c3sl.participatorio;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.validation.constraints.NotNull;
+
import org.springframework.roo.addon.javabean.RooJavaBean;
import org.springframework.roo.addon.jpa.activerecord.RooJpaActiveRecord;
import org.springframework.roo.addon.tostring.RooToString;
@@ -13,8 +17,10 @@ public class Usuario {
private String login;
+ @NotNull
private String senha;
+ @Enumerated(EnumType.STRING)
private TipoUsuario permissao;
}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
index fa8d398d2dbf8a1df0d46c8d7ab8fb40b8955462..c2758a58854c10b070d94c806c04510c44fa9b9a 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController.java
@@ -1,10 +1,10 @@
package br.ufpr.c3sl.participatorio.web;
-import br.ufpr.c3sl.participatorio.Projeto;
-import br.ufpr.c3sl.participatorio.enums.TipoStatus;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
+
import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
@@ -13,6 +13,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
+import br.ufpr.c3sl.participatorio.Projeto;
+import br.ufpr.c3sl.participatorio.Usuario;
+import br.ufpr.c3sl.participatorio.enums.TipoStatus;
+
@RequestMapping("/projetoes")
@Controller
@RooWebScaffold(path = "projetoes", formBackingObject = Projeto.class)
@@ -24,11 +28,31 @@ public class ProjetoController {
populateEditForm(uiModel, projeto);
return "projetoes/create";
}
- uiModel.asMap().clear();
+
projeto.setEstado(TipoStatus.Candidato);
+
+ Usuario u = (Usuario) Usuario.entityManager().createNativeQuery("select * from usuario where login='"+SecurityContextHolder.getContext().getAuthentication().getName()+"'", Usuario.class).getSingleResult();
+ projeto.setUsuario(u);
+
+ uiModel.asMap().clear();
projeto.persist();
return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
}
+
+ @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
+ public String update(@Valid Projeto projeto, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, projeto);
+ return "projetoes/update";
+ }
+
+ Projeto p = (Projeto) Projeto.entityManager().createNativeQuery("select * from projeto where id = "+projeto.getId(), Projeto.class).getSingleResult();
+ projeto.setUsuario(p.getUsuario());
+
+ uiModel.asMap().clear();
+ projeto.merge();
+ return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
+ }
@RequestMapping(value = "/{id}", produces = "text/html")
public String show(@PathVariable("id") Long id, Model uiModel) {
@@ -84,6 +108,21 @@ public class ProjetoController {
addDateTimeFormatPatterns(uiModel);
return "projetoes/list";
}
+
+ @RequestMapping(value = "meusprojetos", produces = "text/html")
+ public String listMeusProjetos(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ if (page != null || size != null) {
+ int sizeNo = size == null ? 10 : size.intValue();
+ final int firstResult = page == null ? 0 : (page.intValue() - 1) * sizeNo;
+ uiModel.addAttribute("projetoes", Projeto.findProjetoEntries(firstResult, sizeNo));
+ float nrOfPages = (float) Projeto.countProjetoes() / sizeNo;
+ uiModel.addAttribute("maxPages", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));
+ } else {
+ uiModel.addAttribute("projetoes", Projeto.findMeusProjetos());
+ }
+ addDateTimeFormatPatterns(uiModel);
+ return "projetoes/list";
+ }
@RequestMapping(value = "/{id}", params = "status", method = RequestMethod.POST, produces = "text/html")
public String updateStatus(@PathVariable("id") Long id, @RequestParam(value = "status", required = true) String status, HttpServletRequest httpServletRequest) {
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj
index c150c7740991bc14f2bab2f4b4fde53b8ee12f04..a95a8bf68156175032763ac58607899e0783f6ca 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/ProjetoController_Roo_Controller.aj
@@ -5,6 +5,7 @@ package br.ufpr.c3sl.participatorio.web;
import br.ufpr.c3sl.participatorio.Ministerio;
import br.ufpr.c3sl.participatorio.Projeto;
+import br.ufpr.c3sl.participatorio.Usuario;
import br.ufpr.c3sl.participatorio.enums.TipoAcao;
import br.ufpr.c3sl.participatorio.enums.TipoDemanda;
import br.ufpr.c3sl.participatorio.enums.TipoDiasSemana;
@@ -14,11 +15,9 @@ import br.ufpr.c3sl.participatorio.web.ProjetoController;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
import org.joda.time.format.DateTimeFormat;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,17 +48,6 @@ privileged aspect ProjetoController_Roo_Controller {
return "projetoes/list";
}
- @RequestMapping(method = RequestMethod.PUT, produces = "text/html")
- public String ProjetoController.update(@Valid Projeto projeto, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, projeto);
- return "projetoes/update";
- }
- uiModel.asMap().clear();
- projeto.merge();
- return "redirect:/projetoes/" + encodeUrlPathSegment(projeto.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(value = "/{id}", params = "form", produces = "text/html")
public String ProjetoController.updateForm(@PathVariable("id") Long id, Model uiModel) {
populateEditForm(uiModel, Projeto.findProjeto(id));
@@ -85,6 +73,7 @@ privileged aspect ProjetoController_Roo_Controller {
addDateTimeFormatPatterns(uiModel);
uiModel.addAttribute("ministerios", Ministerio.findAllMinisterios());
uiModel.addAttribute("projetoes", Projeto.findAllProjetoes());
+ uiModel.addAttribute("usuarios", Usuario.findAllUsuarios());
uiModel.addAttribute("tipoacaos", Arrays.asList(TipoAcao.values()));
uiModel.addAttribute("tipodemandas", Arrays.asList(TipoDemanda.values()));
uiModel.addAttribute("tipodiassemanas", Arrays.asList(TipoDiasSemana.values()));
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java
index 70f6b3f9b5fa2f03569489d7333f27d798525b16..4ef263f9881a7fc76deb36267644dddff3096ab5 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java
@@ -1,12 +1,37 @@
package br.ufpr.c3sl.participatorio.web;
-import br.ufpr.c3sl.participatorio.Usuario;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
+import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import br.ufpr.c3sl.participatorio.Usuario;
@RequestMapping("/usuarios")
@Controller
@RooWebScaffold(path = "usuarios", formBackingObject = Usuario.class)
public class UsuarioController {
+
+ @RequestMapping(method = RequestMethod.POST, produces = "text/html")
+ public String create(@Valid Usuario usuario, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
+ if (bindingResult.hasErrors()) {
+ populateEditForm(uiModel, usuario);
+ return "usuarios/create";
+ }
+
+ ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);
+
+ usuario.setSenha(encoder.encodePassword(usuario.getSenha(), ""));
+
+ uiModel.asMap().clear();
+ usuario.persist();
+ return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.getId().toString(), httpServletRequest);
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController_Roo_Controller.aj
index 9f596aa22a8535bdc7c1f40fe6fb358d48115fbf..e9029718a9ab10d98deb1728219b81d88d829b48 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController_Roo_Controller.aj
@@ -21,17 +21,6 @@ import org.springframework.web.util.WebUtils;
privileged aspect UsuarioController_Roo_Controller {
- @RequestMapping(method = RequestMethod.POST, produces = "text/html")
- public String UsuarioController.create(@Valid Usuario usuario, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {
- if (bindingResult.hasErrors()) {
- populateEditForm(uiModel, usuario);
- return "usuarios/create";
- }
- uiModel.asMap().clear();
- usuario.persist();
- return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.getId().toString(), httpServletRequest);
- }
-
@RequestMapping(params = "form", produces = "text/html")
public String UsuarioController.createForm(Model uiModel) {
populateEditForm(uiModel, new Usuario());
diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml b/src/main/resources/META-INF/spring/applicationContext-security.xml
index 31db4d146e1619494acd1b74854d3e19697d7d0d..35ec6c95bf2ef9d61faca8560c1113e39d4cd242 100644
--- a/src/main/resources/META-INF/spring/applicationContext-security.xml
+++ b/src/main/resources/META-INF/spring/applicationContext-security.xml
@@ -9,16 +9,16 @@
<form-login login-processing-url="/resources/j_spring_security_check" login-page="/login" authentication-failure-url="/login?login_error=t" />
<logout logout-url="/resources/j_spring_security_logout" />
<!-- Configure these elements to secure URIs in your application -->
- <intercept-url pattern="/choices/**" access="hasRole('ROLE_ADMIN')" />
+ <intercept-url pattern="/choices/**" access="hasRole('Administrador')" />
<intercept-url pattern="/member/**" access="isAuthenticated()" />
<intercept-url pattern="/resources/**" access="permitAll" />
<intercept-url pattern="/login" access="permitAll" />
- <intercept-url pattern="/ministerios**" access="hasRole('ROLE_ADMIN')" />
- <intercept-url pattern="/ministerios**" access="hasRole('ROLE_ADMIN')" method="POST" />
+ <intercept-url pattern="/ministerios**" access="hasRole('Administrador')" />
+ <intercept-url pattern="/ministerios**" access="hasRole('Administrador')" method="POST" />
- <!-- <intercept-url pattern="/usuarios**" access="hasRole('ROLE_ADMIN')" />
- <intercept-url pattern="/usuarios**" access="hasRole('ROLE_ADMIN')" method="POST" /> -->
+ <intercept-url pattern="/usuarios**" access="hasRole('Administrador')" />
+ <intercept-url pattern="/usuarios**" access="hasRole('Administrador')" method="POST" />
<intercept-url pattern="/**" access="isAuthenticated()" />
</http>
@@ -26,11 +26,19 @@
<authentication-manager alias="authenticationManager">
<!-- SHA-256 values can be produced using 'echo -n your_desired_password | sha256sum' (using normal *nix environments) -->
<authentication-provider>
- <password-encoder hash="sha-256" />
- <user-service>
- <user name="admin" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918" authorities="ROLE_ADMIN" />
- <user name="user" password="04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb" authorities="ROLE_USER" />
- </user-service>
+
+ <password-encoder hash="sha-256"/>
+
+ <jdbc-user-service
+ data-source-ref="dataSource"
+ users-by-username-query="SELECT login, senha, 't' FROM usuario WHERE login=?"
+ authorities-by-username-query="SELECT login, permissao FROM usuario WHERE login=? " />
+
+ <!-- <user-service>
+ <user name="admin" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918" authorities="Administrador" />
+ <user name="user" password="04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb" authorities="Usuario" />
+ </user-service> -->
+
</authentication-provider>
</authentication-manager>
</beans:beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties
index 030d001d651e46bde373514abbd06cacec42dc3a..07d1be4121ed271c43ff3006f1c9807a072fc085 100644
--- a/src/main/webapp/WEB-INF/i18n/application.properties
+++ b/src/main/webapp/WEB-INF/i18n/application.properties
@@ -1,7 +1,7 @@
-#Updated at Tue Feb 05 11:19:38 BRST 2013
-#Tue Feb 05 11:19:38 BRST 2013
-
+#Updated at Wed Feb 06 10:50:26 BRST 2013
+#Wed Feb 06 10:50:26 BRST 2013
application_name=Participatório
+
label_br_ufpr_c3sl_participatorio_ministerio=Ministério
label_br_ufpr_c3sl_participatorio_ministerio_id=Id
label_br_ufpr_c3sl_participatorio_ministerio_nome=Nome do Ministério
@@ -19,7 +19,7 @@ label_br_ufpr_c3sl_participatorio_projeto_datainicio=Data de Inicio
# demanda -> Qual é a vinculação - Categorias: Educação,Trabalho,Lazer,Esporte,Turismo,Ecologia_e_Meio_Ambiente,Cultura,Saúde,Participação_e_Voluntariado,Justiça,Onde_Ir,Seus_Direitos;
label_br_ufpr_c3sl_participatorio_projeto_demanda=*Demanda
-label_br_ufpr_c3sl_participatorio_projeto_desclegislacao=Discriminação da Legilsação
+label_br_ufpr_c3sl_participatorio_projeto_desclegislacao=Discriminaçãoo da Legislação
label_br_ufpr_c3sl_participatorio_projeto_diasfuncionamento=Dias de Funcionamento
label_br_ufpr_c3sl_participatorio_projeto_email=Email para Contato
label_br_ufpr_c3sl_participatorio_projeto_estado=Estado
@@ -45,15 +45,21 @@ label_br_ufpr_c3sl_participatorio_projeto_pai=Projeto Pai
label_br_ufpr_c3sl_participatorio_projeto_parcerias=Parcerias
label_br_ufpr_c3sl_participatorio_projeto_plural=Projetos
label_br_ufpr_c3sl_participatorio_projeto_possuimonitoramento=Possui Monitoramento?
-label_br_ufpr_c3sl_participatorio_projeto_publicoalvo=Publico Alvo
+label_br_ufpr_c3sl_participatorio_projeto_publicoalvo=Público Alvo
label_br_ufpr_c3sl_participatorio_projeto_publicoprioritario=Público Prioritário
-label_br_ufpr_c3sl_participatorio_projeto_responsavel=Responsável
label_br_ufpr_c3sl_participatorio_projeto_responsaveis=Responsáveis
+label_br_ufpr_c3sl_participatorio_projeto_responsavel=Responsável
label_br_ufpr_c3sl_participatorio_projeto_rua=Rua
label_br_ufpr_c3sl_participatorio_projeto_site=Site
label_br_ufpr_c3sl_participatorio_projeto_telefoneministerio=Telefone para Contato no Ministério
label_br_ufpr_c3sl_participatorio_projeto_telefones=Telefones
+# Temporalidade - ( ) Temporário ( ) Permanente
+label_br_ufpr_c3sl_participatorio_projeto_temporalidade=*Temporalidade
+
+label_br_ufpr_c3sl_participatorio_projeto_usuario=Usuário
+label_br_ufpr_c3sl_participatorio_projeto_version=Versão
+
label_br_ufpr_c3sl_participatorio_usuario=Usuário
label_br_ufpr_c3sl_participatorio_usuario_id=Id
label_br_ufpr_c3sl_participatorio_usuario_login=Login
@@ -62,19 +68,12 @@ label_br_ufpr_c3sl_participatorio_usuario_plural=Usuários
label_br_ufpr_c3sl_participatorio_usuario_senha=Senha
label_br_ufpr_c3sl_participatorio_usuario_version=Versão
-# Temporalidade - ( ) Temporário ( ) Permanente
-label_br_ufpr_c3sl_participatorio_projeto_temporalidade=*Temporalidade
-
-label_br_ufpr_c3sl_participatorio_projeto_version=Versão
-
menu_category_ministerio_label=Ministério
menu_category_projeto_label=Projeto
menu_category_usuario_label=Usuário
-
menu_item_ministerio_list_label=Ministérios
menu_item_ministerio_new_label=Ministério
menu_item_projeto_list_label=Projetos
menu_item_projeto_new_label=Projeto
-
menu_item_usuario_list_label=Usuários
menu_item_usuario_new_label=Usuário
diff --git a/src/main/webapp/WEB-INF/i18n/messages.properties b/src/main/webapp/WEB-INF/i18n/messages.properties
index 42e79c3d9ec66c287305660ee5a73322c25e10b9..9464850c1008653244831128a29c5c28dc5a7dec 100644
--- a/src/main/webapp/WEB-INF/i18n/messages.properties
+++ b/src/main/webapp/WEB-INF/i18n/messages.properties
@@ -13,6 +13,8 @@ global_theme_alt=Alt
global_theme_standard=Padrão
global_generic={0}
+my_projects=Meus Projetos
+
#welcome page
welcome_titlepane=Bem vindo ao {0}
welcome_h3=Bem vindo ao {0}
diff --git a/src/main/webapp/WEB-INF/views/menu.jspx b/src/main/webapp/WEB-INF/views/menu.jspx
index c543f50eb47cf4d70a1f74b65f2301646ada8c3d..1b51c1188f5560925b89e4d4fa46e70ea5e6c442 100644
--- a/src/main/webapp/WEB-INF/views/menu.jspx
+++ b/src/main/webapp/WEB-INF/views/menu.jspx
@@ -9,9 +9,11 @@
<menu:item id="i_projeto_list" messageCode="global_menu_list_candidato" url="/projetoes/listCandidatos" z="user-managed"/>
<menu:item id="i_projeto_list" messageCode="global_menu_list_efetivo" url="/projetoes/listEfetivos" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
<menu:item id="i_projeto_list" messageCode="global_menu_list_rejeitado" url="/projetoes/listRejeitados" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
+
+ <menu:item id="i_projeto_list" messageCode="my_projects" url="/projetoes/meusprojetos" z="x1vvsZFRYLoITzX2jIKG93Z4DWM="/>
</menu:category>
- <sec:authorize ifAnyGranted="ROLE_ADMIN">
+ <sec:authorize ifAnyGranted="Administrador">
<menu:category id="c_ministerio" z="bdCebF8Z2eynkkyAMp/B5OZGV9A=">
<menu:item id="i_ministerio_new" messageCode="global_menu_new" url="/ministerios?form" z="6OpG3M2+Gvw8amn9aYg7/7zwAds="/>
<menu:item id="i_ministerio_list" messageCode="global_menu_list" url="/ministerios?page=1&size=${empty param.size ? 10 : param.size}" z="3dj4WmtVHkR+jV7Vbj/veXWsVQ8="/>
diff --git a/src/main/webapp/WEB-INF/views/projetoes/create.jspx b/src/main/webapp/WEB-INF/views/projetoes/create.jspx
index 05c4fd50459866acc945cc3af1e5467b587f1f15..f94b92fdd49bba0e02c858360b8a03968d4c9072 100644
--- a/src/main/webapp/WEB-INF/views/projetoes/create.jspx
+++ b/src/main/webapp/WEB-INF/views/projetoes/create.jspx
@@ -43,6 +43,7 @@
<field:input field="descLegislacao" id="c_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" z="Y9X3/A7OHfh+T5M4c7uRjtx2Uak="/>
<field:input field="obs" id="c_br_ufpr_c3sl_participatorio_Projeto_obs" z="5b+Wjz0npE5n2wk2R6g1fJZD0VA="/>
<field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" render="false" z="user-managed"/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_participatorio_Projeto" render="${not empty dependencies}" z="nyMkb0MYQtlthVlj4JcyqCQYyRg="/>
</div>
diff --git a/src/main/webapp/WEB-INF/views/projetoes/list.jspx b/src/main/webapp/WEB-INF/views/projetoes/list.jspx
index 2aae19fe1d4539d6febdc0f2b038487f1634d8b9..de7877c31543d247b53bbe6e2aab1a9961b44e9e 100644
--- a/src/main/webapp/WEB-INF/views/projetoes/list.jspx
+++ b/src/main/webapp/WEB-INF/views/projetoes/list.jspx
@@ -2,7 +2,7 @@
<div xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:page="urn:jsptagdir:/WEB-INF/tags/form" xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:sec="http://www.springframework.org/security/tags" version="2.0">
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
- <sec:authorize ifAnyGranted="ROLE_ADMIN">
+ <sec:authorize ifAnyGranted="Administrador">
<page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
<table:table data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/>
@@ -15,7 +15,7 @@
</page:list>
</sec:authorize>
- <sec:authorize ifAnyGranted="ROLE_USER">
+ <sec:authorize ifAnyGranted="Usuario">
<page:list id="pl_br_ufpr_c3sl_participatorio_Projeto" items="${projetoes}" z="xI7fvnW1b0tKUMMJrSKIiv3ycH0=">
<table:table update="false" delete="false" data="${projetoes}" id="l_br_ufpr_c3sl_participatorio_Projeto" path="/projetoes" z="kamtALNOBI9qFO/YY+1GYa1OhVw=">
<table:column id="c_br_ufpr_c3sl_participatorio_Projeto_pai" property="pai" z="JnX374OPNV+3oLlfOcMYu3wG024="/>
diff --git a/src/main/webapp/WEB-INF/views/projetoes/show.jspx b/src/main/webapp/WEB-INF/views/projetoes/show.jspx
index 82a4e4cfb3f1184b1dbcf0135258c60da2dd7736..26a577fb31dfb3f3eb474e30ebfcac03a18ec4fb 100644
--- a/src/main/webapp/WEB-INF/views/projetoes/show.jspx
+++ b/src/main/webapp/WEB-INF/views/projetoes/show.jspx
@@ -43,5 +43,6 @@
<field:display field="descLegislacao" id="s_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" object="${projeto}" z="JL3fGOirqjzo/jfvrpOEsWfdtuE="/>
<field:display field="obs" id="s_br_ufpr_c3sl_participatorio_Projeto_obs" object="${projeto}" z="+RB342ExVwf7Jpb2LEAVsNVT3tY="/>
<field:display field="estado" id="s_br_ufpr_c3sl_participatorio_Projeto_estado" object="${projeto}" z="QQqAirebJjfsfFvZ2yTuji9gMYY="/>
+ <field:display field="usuario" id="s_br_ufpr_c3sl_participatorio_Projeto_usuario" object="${projeto}" z="zYLKtpIbUdPWnBZ97hES9bx740A="/>
</page:show>
</div>
diff --git a/src/main/webapp/WEB-INF/views/projetoes/update.jspx b/src/main/webapp/WEB-INF/views/projetoes/update.jspx
index f5d1489b718118f93a9dc89f8aa826c7bab42cb9..edebc77a0aef78962f071e26c3b3b0877e40a259 100644
--- a/src/main/webapp/WEB-INF/views/projetoes/update.jspx
+++ b/src/main/webapp/WEB-INF/views/projetoes/update.jspx
@@ -43,5 +43,6 @@
<field:input field="descLegislacao" id="c_br_ufpr_c3sl_participatorio_Projeto_descLegislacao" z="Y9X3/A7OHfh+T5M4c7uRjtx2Uak="/>
<field:input field="obs" id="c_br_ufpr_c3sl_participatorio_Projeto_obs" z="5b+Wjz0npE5n2wk2R6g1fJZD0VA="/>
<field:select field="estado" id="c_br_ufpr_c3sl_participatorio_Projeto_estado" items="${tipostatuses}" path="tipostatuses" z="K+kNv0Ov3Ulu6LiKPBQ71hczlOA="/>
+ <field:select field="usuario" id="c_br_ufpr_c3sl_participatorio_Projeto_usuario" itemValue="id" items="${usuarios}" path="/usuarios" render="false" z="user-managed"/>
</form:update>
</div>
diff --git a/src/main/webapp/WEB-INF/views/usuarios/create.jspx b/src/main/webapp/WEB-INF/views/usuarios/create.jspx
index 3f3d9860f7a13bd9f923c4a751503b48298a3f8a..df0f8de3e720a6b2bbe4fc0e3e8af32684fa76a5 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/create.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/create.jspx
@@ -4,7 +4,7 @@
<jsp:output omit-xml-declaration="yes"/>
<form:create id="fc_br_ufpr_c3sl_participatorio_Usuario" modelAttribute="usuario" path="/usuarios" render="${empty dependencies}" z="sBi0BIbhxfFtvS44zYHnLMODwjM=">
<field:input field="login" id="c_br_ufpr_c3sl_participatorio_Usuario_login" z="6OvGa7M/0sPSzNSclLE7Y4sb/oU="/>
- <field:input field="senha" id="c_br_ufpr_c3sl_participatorio_Usuario_senha" z="Fzw/QULORJ8+FIOQOF8H5WEf7o4="/>
+ <field:input field="senha" id="c_br_ufpr_c3sl_participatorio_Usuario_senha" type="password" required="true" z="Fzw/QULORJ8+FIOQOF8H5WEf7o4="/>
<field:select field="permissao" id="c_br_ufpr_c3sl_participatorio_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" z="Kpb8JBzpJ7PYZ9+dbrK6o6SJM18="/>
</form:create>
<form:dependency dependencies="${dependencies}" id="d_br_ufpr_c3sl_participatorio_Usuario" render="${not empty dependencies}" z="2S2Khlt8Zs3QW0bxgIewXxuzBz4="/>
diff --git a/src/main/webapp/WEB-INF/views/usuarios/update.jspx b/src/main/webapp/WEB-INF/views/usuarios/update.jspx
index f498d046d6ec2b54daf40b330e4eb6ac9c5580b4..a68f7ee3258a5bc108a802fa807befbf8b9f0e1d 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/update.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/update.jspx
@@ -4,7 +4,7 @@
<jsp:output omit-xml-declaration="yes"/>
<form:update id="fu_br_ufpr_c3sl_participatorio_Usuario" modelAttribute="usuario" path="/usuarios" versionField="Version" z="SwzSibl5xLBOtbcLMDq7FqYkcuI=">
<field:input field="login" id="c_br_ufpr_c3sl_participatorio_Usuario_login" z="6OvGa7M/0sPSzNSclLE7Y4sb/oU="/>
- <field:input field="senha" id="c_br_ufpr_c3sl_participatorio_Usuario_senha" z="Fzw/QULORJ8+FIOQOF8H5WEf7o4="/>
+ <field:input field="senha" id="c_br_ufpr_c3sl_participatorio_Usuario_senha" type="password" required="true" z="Fzw/QULORJ8+FIOQOF8H5WEf7o4="/>
<field:select field="permissao" id="c_br_ufpr_c3sl_participatorio_Usuario_permissao" items="${tipousuarios}" path="tipousuarios" z="Kpb8JBzpJ7PYZ9+dbrK6o6SJM18="/>
</form:update>
</div>