diff --git a/src/main/java/org/springframework/cheapy/web/AdministratorController.java b/src/main/java/org/springframework/cheapy/web/AdministratorController.java index 82571e5f8..d5e001f77 100644 --- a/src/main/java/org/springframework/cheapy/web/AdministratorController.java +++ b/src/main/java/org/springframework/cheapy/web/AdministratorController.java @@ -89,20 +89,4 @@ public class AdministratorController { this.clientService.saveClient(client); return "redirect:/administrators/clients"; } - - @GetMapping(value = "/administrators/clients/{username}/activate") - public String activateClient(@PathVariable("username") final String username, final ModelMap model) { - - Client client = this.clientService.findByUsername(username); - model.put("client", client); - return "clients/clientActivate"; - } - @PostMapping(value = "/administrators/clients/{username}/activate") - public String activateClientForm(@PathVariable("username") final String username, final ModelMap model, final HttpServletRequest request) { - - Client client = this.clientService.findByUsername(username); - client.getUsuar().setEnabled(true); - this.clientService.saveClient(client); - return "redirect:/administrators/clients"; - } } diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp deleted file mode 100644 index 07f6e365d..000000000 --- a/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp +++ /dev/null @@ -1,25 +0,0 @@ -<%@ page session="false" trimDirectiveWhitespaces="true"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> -<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> - - - - - ¿Está seguro de que quiere activar esta cuenta? - - - - - - - Activar - - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp index d3e07db78..e83809451 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp @@ -69,26 +69,16 @@ Borrar cliente - + - + Desactivar cliente - - - - - - - - - Activar cliente -