From fe741fa5bfed7558456ef3a45fa1098743a42891 Mon Sep 17 00:00:00 2001
From: Fabiano Sluzarski <fs09@inf.ufpr.br>
Date: Wed, 3 Apr 2013 10:36:00 -0300
Subject: [PATCH] fix panel na tela de trocar senha do usuario
---
.../web/MinisterioController.java | 15 ++++++++++++++
.../MinisterioController_Roo_Controller.aj | 10 ----------
.../participatorio/web/UsuarioController.java | 20 +++++++++++++++++--
.../web/UsuarioController_Roo_Controller.aj | 18 -----------------
.../views/usuarios/changepassword.jspx | 6 +++---
5 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController.java b/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController.java
index 1807954..8542c1b 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController.java
@@ -3,10 +3,25 @@ package br.ufpr.c3sl.participatorio.web;
import br.ufpr.c3sl.participatorio.Ministerio;
import org.springframework.roo.addon.web.mvc.controller.scaffold.RooWebScaffold;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
@RequestMapping("/ministerios")
@Controller
@RooWebScaffold(path = "ministerios", formBackingObject = Ministerio.class)
public class MinisterioController {
+
+ @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
+ public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ Ministerio ministerio = Ministerio.findMinisterio(id);
+ ministerio.remove();
+ //uiModel.asMap().clear();
+ //uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
+ //uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
+ return "redirect:/ministerios";
+ }
+
}
diff --git a/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController_Roo_Controller.aj b/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController_Roo_Controller.aj
index f191088..e366017 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController_Roo_Controller.aj
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/MinisterioController_Roo_Controller.aj
@@ -74,16 +74,6 @@ privileged aspect MinisterioController_Roo_Controller {
return "ministerios/update";
}
- @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
- public String MinisterioController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
- Ministerio ministerio = Ministerio.findMinisterio(id);
- ministerio.remove();
- uiModel.asMap().clear();
- uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
- uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
- return "redirect:/ministerios";
- }
-
void MinisterioController.populateEditForm(Model uiModel, Ministerio ministerio) {
uiModel.addAttribute("ministerio", ministerio);
}
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 0cb64df..2cca400 100644
--- a/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java
+++ b/src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java
@@ -1,5 +1,7 @@
package br.ufpr.c3sl.participatorio.web;
+import java.util.Arrays;
+
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import br.ufpr.c3sl.participatorio.Usuario;
+import br.ufpr.c3sl.participatorio.enums.TipoUsuario;
@RequestMapping("/usuarios")
@Controller
@@ -52,8 +55,21 @@ public class UsuarioController {
usuario.merge();
return "redirect:/usuarios/" + encodeUrlPathSegment(usuario.getId().toString(), httpServletRequest);
}
-
-
+
+ @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
+ public String delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
+ Usuario usuario = Usuario.findUsuario(id);
+ usuario.remove();
+ //uiModel.asMap().clear();
+ //uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
+ //uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
+ return "redirect:/usuarios";
+ }
+
+ void populateEditForm(Model uiModel, Usuario usuario) {
+ uiModel.addAttribute("usuario", usuario);
+ uiModel.addAttribute("tipousuarios", Arrays.asList(TipoUsuario.Usuario, TipoUsuario.Administrador/*TipoUsuario.values()*/));
+ }
@RequestMapping(value = "changepassword", method = RequestMethod.GET)
public String chancePassword() {
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 ca2c015..37e1839 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
@@ -4,15 +4,12 @@
package br.ufpr.c3sl.participatorio.web;
import br.ufpr.c3sl.participatorio.Usuario;
-import br.ufpr.c3sl.participatorio.enums.TipoUsuario;
import br.ufpr.c3sl.participatorio.web.UsuarioController;
import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.util.UriUtils;
import org.springframework.web.util.WebUtils;
@@ -52,21 +49,6 @@ privileged aspect UsuarioController_Roo_Controller {
return "usuarios/update";
}
- @RequestMapping(value = "/{id}", method = RequestMethod.DELETE, produces = "text/html")
- public String UsuarioController.delete(@PathVariable("id") Long id, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, Model uiModel) {
- Usuario usuario = Usuario.findUsuario(id);
- usuario.remove();
- uiModel.asMap().clear();
- uiModel.addAttribute("page", (page == null) ? "1" : page.toString());
- uiModel.addAttribute("size", (size == null) ? "10" : size.toString());
- return "redirect:/usuarios";
- }
-
- void UsuarioController.populateEditForm(Model uiModel, Usuario usuario) {
- uiModel.addAttribute("usuario", usuario);
- uiModel.addAttribute("tipousuarios", Arrays.asList(TipoUsuario.values()));
- }
-
String UsuarioController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
String enc = httpServletRequest.getCharacterEncoding();
if (enc == null) {
diff --git a/src/main/webapp/WEB-INF/views/usuarios/changepassword.jspx b/src/main/webapp/WEB-INF/views/usuarios/changepassword.jspx
index 835296d..27ec8a7 100644
--- a/src/main/webapp/WEB-INF/views/usuarios/changepassword.jspx
+++ b/src/main/webapp/WEB-INF/views/usuarios/changepassword.jspx
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" 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" version="2.0">
+<div xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields" xmlns:util="urn:jsptagdir:/WEB-INF/tags/util" 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" version="2.0">
<jsp:directive.page import="org.springframework.ui.Model"/>
<jsp:directive.page contentType="text/html;charset=UTF-8"/>
<jsp:output omit-xml-declaration="yes"/>
-
+ <util:panel id="title" title="Trocar senha">
<b>Informe sua senha antiga e sua nova senha.</b>
<p/>
<form name="chancepassword" action="updatepassword" method="get">
@@ -12,6 +12,6 @@
<field:input field="newpassword" type="password" id="c_br_ufpr_c3sl_participatorio_usuario_newpass" disableFormBinding="true" z="user_managed"/>
<input type="submit" value="Save"/>
</form>
-
+ </util:panel>
</div>
--
GitLab