fix panel na tela de trocar senha do usuario

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";
+    }
+    
 }

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);
     }

src/main/java/br/ufpr/c3sl/participatorio/web/UsuarioController.java

 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
@@ -53,7 +56,20 @@ public class UsuarioController {
         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() {

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) {

src/main/webapp/WEB-INF/views/usuarios/changepassword.jspx

 <?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>