diff --git a/src/controller/access/AccessControllerAdd.java b/src/controller/access/AccessControllerAdd.java index c8bd32e..793a7cf 100644 --- a/src/controller/access/AccessControllerAdd.java +++ b/src/controller/access/AccessControllerAdd.java @@ -1,19 +1,28 @@ package controller.access; +import controller.PMF; +import controller.resources.ResourcesControllerView; +import controller.roles.RolesControllerView; +import controller.users.UsersControllerView; +import model.Access; +import model.Resource; +import model.Role; +import model.User; + +import javax.jdo.PersistenceManager; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import java.io.IOException; import java.util.List; -import javax.servlet.http.*; -import com.google.appengine.api.datastore.Key; -import com.google.appengine.api.datastore.KeyFactory; - -import controller.PMF; - -import javax.servlet.*; -import javax.jdo.PersistenceManager; -import model.entity.*; @SuppressWarnings("serial") public class AccessControllerAdd extends HttpServlet { + + @SuppressWarnings("unchecked") public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { PersistenceManager pm = PMF.get().getPersistenceManager(); /*Role r = new Role("mesero"); @@ -24,43 +33,108 @@ public class AccessControllerAdd extends HttpServlet { } finally { pm.close(); }*/ - try{ - System.out.print(request.getParameter("info")); - String query = "select from " + Role.class.getName(); - String query2 = "select from " + Resource.class.getName(); - List roles = (List)pm.newQuery(query).execute(); - List resources = (List)pm.newQuery(query2).execute(); - request.setAttribute("roles", roles); - request.setAttribute("resources", resources); - String queryp = "select " + Role.class.getName(); - RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/Views/Access/add.jsp"); - dispatcher.forward(request, response); - try{ - if(request.getParameter("info").equals("agregar")){ - String idRole=request.getParameter("rolesl"); - String idResource=request.getParameter("resourcesl"); - if(idRole == null || idRole.equals("")|| idResource == null || idResource.equals("")){System.out.print("nombre vacio");} - else{ - Access a = new Access( - new Long(idRole).longValue(), - new Long(idResource).longValue(), - true - ); - //persist the entity - try { - System.out.print(request.getParameter("action")); - pm.makePersistent(a); - } finally { - pm.close(); - } - } - } - }catch (java.lang.NullPointerException np){} - }catch(java.lang.NullPointerException np){} { - System.out.print("error"); - } + + System.out.print(request.getParameter("info")); + + String query = "select from " + Role.class.getName(); + String query2 = "select from " + Resource.class.getName(); + + List roles = RolesControllerView.getAllRoles(); + List resources = ResourcesControllerView.getAllResources(); + + request.setAttribute("roles", roles); + request.setAttribute("resources", resources); + + boolean redirect = true; + + //String queryp = "select " + Role.class.getName(); + + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Access/add.jsp"); + + if (request.getParameter("info") == null){ + + try{ + HttpSession sesion= request.getSession(); + + User user = UsersControllerView.getUser(sesion.getAttribute("userID").toString()); + if (user == null) throw new NullPointerException("UsersControllerIndex: El usuario recibido es nulo."); + + request.setAttribute("User",user); + request.setAttribute("ResourceList",ResourcesControllerView.getAllResources()); + + dispatcher.forward(request,response); + redirect = false; + + } + //Si no la encuentra, redirige a la pagina inicial. + catch (Exception e){ + e.printStackTrace(); + response.getWriter().println(""); + } + + } + else if(request.getParameter("info").equals("agregar")){ + + String idRole = request.getParameter("rolesl"); + String idResource = request.getParameter("resourcesl"); + + if(idRole == null || idRole.equals("")|| idResource == null || idResource.equals("")){ + System.out.print("nombre vacio"); + } + else { + Access a = new Access(idRole, idResource,true); + //persist the entity + pm.makePersistent(a); + + } + } + else if (request.getParameter("info").equals("check")){ + response.getWriter().print(accessExist(request.getParameter("rolesl"),request.getParameter("resourcesl"))); + redirect = false; + } + + pm.close(); + + try{ + if (redirect) + response.sendRedirect("/access"); + } + //Al redirigr al jsp para crear, se usa RequestDispatcher, y este entra en conflicto con sendRedirect. + catch (IllegalStateException e){ + System.err.println("IllegalStateException: There was a double redirect."); + } + + } public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doGet(request, response); } + + @SuppressWarnings("unchecked") + private boolean accessExist(String role, String resource){ + + System.out.println("\nCheking..."); + PersistenceManager pm = PMF.get().getPersistenceManager(); + + List accessList = (List) pm.newQuery("select from " + Access.class.getName()).execute(); + + try { + String roleKey = RolesControllerView.getRole(role).getKey(); + String resourceKey = ResourcesControllerView.getResource(resource).getKey(); + for (Access access: accessList){ + if (access.getIdRole().equals(roleKey)){ + if (access.getIdResource().equals(resourceKey)){ + System.out.println("Hey! That Access already Exists!! v:<"); + return true; + } + } + } + System.out.println("nope :p"); + return false; + } catch (IllegalArgumentException e){ + System.out.println("A parameter is illegal... Maybe the AJAX call is incomplete?"); + return true; + } + + } } \ No newline at end of file diff --git a/src/controller/access/AccessControllerDelete.java b/src/controller/access/AccessControllerDelete.java index 8ccb6bb..788ea01 100644 --- a/src/controller/access/AccessControllerDelete.java +++ b/src/controller/access/AccessControllerDelete.java @@ -7,7 +7,7 @@ import java.util.List; import java.text.DateFormat; import javax.servlet.*; import javax.jdo.PersistenceManager; -import model.entity.*; +import model.*; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; diff --git a/src/controller/access/AccessControllerEdit.java b/src/controller/access/AccessControllerEdit.java index 9679280..91ca5b6 100644 --- a/src/controller/access/AccessControllerEdit.java +++ b/src/controller/access/AccessControllerEdit.java @@ -1,17 +1,20 @@ package controller.access; -import java.io.IOException; -import javax.servlet.http.*; -import java.util.Date; -import java.util.List; -import java.text.DateFormat; -import javax.servlet.*; -import javax.jdo.PersistenceManager; -import model.entity.*; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; - import controller.PMF; +import model.Access; +import model.Resource; +import model.Role; + +import javax.jdo.PersistenceManager; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; @SuppressWarnings("serial") public class AccessControllerEdit extends HttpServlet { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -19,7 +22,7 @@ public class AccessControllerEdit extends HttpServlet { PersistenceManager pm = PMF.get().getPersistenceManager(); try{ System.out.print(request.getParameter("info")); - Key k = KeyFactory.createKey(Access.class.getSimpleName(), new Long(request.getParameter("id")).longValue()); + Key k = KeyFactory.createKey(Access.class.getSimpleName(), new Long(request.getParameter("id"))); Access a = pm.getObjectById(Access.class, k); request.setAttribute("access", a); String query = "select from " + Role.class.getName(); @@ -28,23 +31,30 @@ public class AccessControllerEdit extends HttpServlet { List resources = (List)pm.newQuery(query2).execute(); request.setAttribute("roles", roles); request.setAttribute("resources", resources); - RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/Views/Access/edit.jsp"); + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Access/edit.jsp"); dispatcher.forward(request, response); + try{ if(request.getParameter("info").equals("editar")){ String idRole=request.getParameter("rolesl"); String idResource=request.getParameter("resourcesl"); if(idRole == null || idRole.equals("")|| idResource == null || idResource.equals("")){System.out.print("nombre vacio");} else{ - if(a.getIdRole().equals(idRole)==false){ - a.setIdRole(new Long(idRole).longValue()); + + if(!a.getIdRole().equals(idRole)){ + a.setIdRole(idRole); } - if(a.getIdResource().equals(idResource)==false){ - a.setIdResource(new Long(idResource).longValue()); + + if(!a.getIdResource().equals(idResource)){ + a.setIdResource(idResource); } + } } - }catch (java.lang.NullPointerException np){} + }catch (java.lang.NullPointerException np){ + + } + }catch(javax.jdo.JDOObjectNotFoundException nf) { response.sendRedirect("/index.html"); } diff --git a/src/controller/access/AccessControllerIndex.java b/src/controller/access/AccessControllerIndex.java index 0ee92fd..6ee3cb7 100644 --- a/src/controller/access/AccessControllerIndex.java +++ b/src/controller/access/AccessControllerIndex.java @@ -1,32 +1,64 @@ package controller.access; -import java.io.IOException; -import javax.servlet.http.*; -import java.util.Date; -import java.util.List; -import java.text.DateFormat; -import javax.servlet.*; -import javax.jdo.PersistenceManager; -import model.entity.*; -import com.google.appengine.api.datastore.Key; -import com.google.appengine.api.datastore.KeyFactory; - import controller.PMF; +import controller.resources.ResourcesControllerView; +import controller.users.UsersControllerView; +import model.Access; +import model.User; + +import javax.jdo.PersistenceManager; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.util.List; + @SuppressWarnings("serial") public class AccessControllerIndex extends HttpServlet { + public void doGet(HttpServletRequest request, HttpServletResponse response)throws ServletException, IOException { + // create the persistence manager instance PersistenceManager pm = PMF.get().getPersistenceManager(); - // query for the entities by name - String query = "select from " + Access.class.getName(); - List accesses = (List)pm.newQuery(query).execute(); - // pass the list to the jsp - request.setAttribute("accesses", accesses); - // forward the request to the jsp - RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/Views/Access/index.jsp"); - dispatcher.forward(request, response); + + + //Se usa para revisar si hay una sesion activa + HttpSession sesion= request.getSession(); + + //Intenta hallar una sesion activa + try{ + User user = UsersControllerView.getUser(sesion.getAttribute("userID").toString()); + if (user == null) throw new NullPointerException("UsersControllerIndex: El usuario recibido es nulo."); + + request.setAttribute("User",user); + + // query for the entities by name + String query = "select from " + Access.class.getName(); + List accesses = (List)pm.newQuery(query).execute(); + + // pass the list to the jsp + request.setAttribute("accesses", accesses); + + // forward the request to the jsp + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Access/index.jsp"); + dispatcher.forward(request, response); + + } + //Si no la encuentra, redirige a la pagina inicial. + catch (Exception e){ + e.printStackTrace(); + response.getWriter().println(""); + } finally { + pm.close(); + } + } + public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doGet(request, response); } + } \ No newline at end of file diff --git a/src/controller/access/AccessControllerView.java b/src/controller/access/AccessControllerView.java index 2be0659..c1817b9 100644 --- a/src/controller/access/AccessControllerView.java +++ b/src/controller/access/AccessControllerView.java @@ -1,43 +1,59 @@ package controller.access; -import java.io.IOException; -import javax.servlet.http.*; -import java.util.Date; -import java.util.List; -import java.text.DateFormat; -import javax.servlet.*; -import javax.jdo.PersistenceManager; -import model.entity.*; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import controller.PMF; +import model.Access; +import model.Resource; +import model.Role; + +import javax.jdo.PersistenceManager; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; @SuppressWarnings("serial") public class AccessControllerView extends HttpServlet { + public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // create the persistence manager instance PersistenceManager pm = PMF.get().getPersistenceManager(); try{ + System.out.print(request.getParameter("info")); - Key k = KeyFactory.createKey(Access.class.getSimpleName(), new Long(request.getParameter("id")).longValue()); + + Key k = KeyFactory.createKey(Access.class.getSimpleName(), new Long(request.getParameter("id"))); Access a = pm.getObjectById(Access.class, k); + request.setAttribute("access", a); + Key krol = KeyFactory.createKey(Role.class.getSimpleName(), a.getIdRole()); Role rol = pm.getObjectById(Role.class, krol); + String nrol = rol.getName(); + Key kres = KeyFactory.createKey(Resource.class.getSimpleName(), a.getIdResource()); Resource res = pm.getObjectById(Resource.class, kres); - String nres = res.getName(); + String nres = res.getUrl(); + System.out.print(nres); + request.setAttribute("role", nrol); request.setAttribute("resource", nres); - RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/Views/Access/view.jsp"); + + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Access/view.jsp"); dispatcher.forward(request, response); + }catch(javax.jdo.JDOObjectNotFoundException nf) { response.sendRedirect("/access"); - } + } } + public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doGet(request, response); } + } \ No newline at end of file diff --git a/src/controller/roles/RolesControllerAdd.java b/src/controller/roles/RolesControllerAdd.java index 49127ba..6a48ba6 100644 --- a/src/controller/roles/RolesControllerAdd.java +++ b/src/controller/roles/RolesControllerAdd.java @@ -52,7 +52,7 @@ public class RolesControllerAdd extends HttpServlet { case "redirect": HttpSession sesion= request.getSession(); - RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Roles/Add.jsp"); + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Roles/add.jsp"); request.setAttribute("User",UsersControllerView.getUser(sesion.getAttribute("userID").toString())); dispatcher.forward(request, response); break; diff --git a/src/controller/users/UsersControllerAdd.java b/src/controller/users/UsersControllerAdd.java index d18e4ea..224be82 100644 --- a/src/controller/users/UsersControllerAdd.java +++ b/src/controller/users/UsersControllerAdd.java @@ -83,7 +83,7 @@ public class UsersControllerAdd extends HttpServlet { //Si lo que se quiere es redirigir al Form para crear usuario case "redirect": HttpSession sesion= request.getSession(); - RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Users/Add.jsp"); + RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/WEB-INF/View/Users/add.jsp"); request.setAttribute("User",UsersControllerView.getUser(sesion.getAttribute("userID").toString())); request.setAttribute("Roles",RolesControllerView.getAllRoles()); dispatcher.forward(request, response); diff --git a/src/model/Access.java b/src/model/Access.java index 49054cd..1fa9adf 100644 --- a/src/model/Access.java +++ b/src/model/Access.java @@ -1,45 +1,80 @@ -package model.entity; +package model; + +import controller.resources.ResourcesControllerView; +import controller.roles.RolesControllerView; +import org.datanucleus.exceptions.NucleusObjectNotFoundException; import javax.jdo.annotations.IdGeneratorStrategy; import javax.jdo.annotations.IdentityType; import javax.jdo.annotations.PersistenceCapable; import javax.jdo.annotations.Persistent; import javax.jdo.annotations.PrimaryKey; + @PersistenceCapable(identityType = IdentityType.APPLICATION) public class Access { -@PrimaryKey -@Persistent(valueStrategy = IdGeneratorStrategy.IDENTITY) private Long id; -@Persistent private Long idRole; -@Persistent private Long idResource; -@Persistent private boolean status; - public Access(Long idRole, Long idResource, boolean status) { - this.idRole = idRole; - this.idResource = idResource; - this.status = status; - } - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - public Long getIdRole() { - return idRole; - } - public void setIdRole(Long idRole) { - this.idRole = idRole; - } - public Long getIdResource() { - return idResource; - } - public void setIdResource(Long idResource) { - this.idResource = idResource; - } - public boolean getStatus() { - return status; - } - public void setStatus(boolean status) { - this.status = status; - } + @PrimaryKey + @Persistent(valueStrategy = IdGeneratorStrategy.IDENTITY) + private Long id; + + @Persistent + private String idRole; + + @Persistent + private String idResource; + + @Persistent + private boolean status; + + public Access(String idRole, String idResource, boolean status) { + this.idRole = idRole; + this.idResource = idResource; + this.status = status; + } + + public Long getId() { + return id; + } + + public String getIdRole() { + return idRole; + } + public void setIdRole(String idRole) { + this.idRole = idRole; + } + + public String getIdResource() { + return idResource; + } + public void setIdResource(String idResource) { + this.idResource = idResource; + } + + public boolean getStatus() { + return status; + } + public void setStatus(boolean status) { + this.status = status; + } + + public String getRoleName(){ + String ret; + try { + ret = RolesControllerView.getRole(idRole).getName(); + } catch (Exception e){ + ret = "The Role doesn´t exists."; + } + return ret; + } + + public String getResourceName(){ + String ret; + try { + ret = ResourcesControllerView.getResource(idResource).getUrl(); + }catch (Exception e){ + ret = "The Resource doesn´t exists."; + } + return ret; + } + } \ No newline at end of file diff --git a/src/model/User.java b/src/model/User.java index 4214502..824394d 100644 --- a/src/model/User.java +++ b/src/model/User.java @@ -28,7 +28,7 @@ public class User { @Persistent private String email; - //Rol del Usuario -> Lo que se alcamcena no es un objeto Role, sino la llave (key) de ese objeto. + //Rol del Usuario -> Lo que se almacena no es un objeto Role, sino la llave (key) de ese objeto. @Persistent private String role; @@ -72,7 +72,14 @@ public class User { return role; } public String getRoleName() { - return RolesControllerView.getRole(role).getName(); + String roleName; + try{ + roleName = RolesControllerView.getRole(role).getName(); + } catch (Exception e){ + roleName = "The Role of this User does not exists."; + } + + return roleName; } public void setRole(String role) { this.role = role; diff --git a/war/WEB-INF/View/Access/add.jsp b/war/WEB-INF/View/Access/add.jsp index f383d8b..4a88a43 100644 --- a/war/WEB-INF/View/Access/add.jsp +++ b/war/WEB-INF/View/Access/add.jsp @@ -1,43 +1,228 @@ <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> -<%@ page import="model.entity.*"%> +<%@ page import="model.*"%> <%@ page import="java.util.List"%> +<% User user = (User) request.getAttribute("User"); %> <% List roles = (List)request.getAttribute("roles"); List resourses = (List)request.getAttribute("resources"); %> - - + + - -Insert title here + + + Add an access - Hotel Services + + + + + + + + + + + + + -Back

-

- - - - -
+ + + +
+
+ Add an Access +
+
+ + + +
+ + + + Role: + <% if(roles.size() > 0) {%> + + <% } else {%> +
+ No Roles registered. + + <% } %> +
+ + Resource: + + <% if (resourses.size() > 0) { %> + + <% } else { %> +
+ No Resources registered. + + <% } %> + +
+ + + +
+ +
+
+ arrow_backGo Back + + +
+ + + + \ No newline at end of file diff --git a/war/WEB-INF/View/Access/edit.jsp b/war/WEB-INF/View/Access/edit.jsp index 790fc5f..c9fee8f 100644 --- a/war/WEB-INF/View/Access/edit.jsp +++ b/war/WEB-INF/View/Access/edit.jsp @@ -1,13 +1,13 @@ <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> -<%@ page import="model.entity.*"%> +<%@ page import="model.*"%> <%@ page import="java.util.List"%> <% List roles = (List)request.getAttribute("roles"); List resourses = (List)request.getAttribute("resources"); Access a = (Access)request.getAttribute("access"); %> - + @@ -22,7 +22,7 @@ <% if (roles.size() > 0) { %> <% for (int i = 0;i <% Role r = (Role)roles.get(i); %> - + <% } %> <% } else { %>

No hay empleados registrados @@ -33,7 +33,7 @@ <% if (resourses.size() > 0) { %> <% for (int i = 0;i <% Resource res = (Resource)resourses.get(i); %> - + <% } %> <% } else { %>

No hay empleados registrados diff --git a/war/WEB-INF/View/Access/index.jsp b/war/WEB-INF/View/Access/index.jsp index 0a02671..78d060f 100644 --- a/war/WEB-INF/View/Access/index.jsp +++ b/war/WEB-INF/View/Access/index.jsp @@ -1,41 +1,173 @@ <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> <%@ page import="java.util.List"%> -<%@ page import="model.entity.*"%> +<%@ page import="model.*"%> <% List accesses = (List)request.getAttribute("accesses"); %> - +<% User usuario = (User) request.getAttribute("User"); %> + - -Insert title here + + Access - Hotel Services + + + + + + + + + + + + + + -Regresar - - - - - - - -<% if (accesses.size() > 0) { %> - <% for (int i = 0;i - <% Access e = (Access)accesses.get(i); %> - - - - - - - - - - <% } %> -
IDRoleResourceStatus
<%= e.getId() %><%= e.getIdRole() %><%= e.getIdResource() %><%= e.getStatus() %>ViewEdit
Delete
-<% } else { %> -

No hay empleados registrados -<% } %> + +

+ +
+
+ Access +
+
+ + addCreate +
+
+ + + <% if (accesses.size() > 0) { %> + + + + + + + + + + + + + + + <% for (Access e: accesses) { %> + + + + + + + + + + <% } %> + + +
IDRoleResourceStatusActions
<%= e.getId() %><%= e.getRoleName() %><%= e.getResourceName() %><%= e.getStatus() %> + View | + Edit | + +
+
+ Delete
+ <% } else { %> + + No Accesses registered. + <% } %> + +
+ + + + \ No newline at end of file diff --git a/war/WEB-INF/View/Access/view.jsp b/war/WEB-INF/View/Access/view.jsp index ec846e1..da79939 100644 --- a/war/WEB-INF/View/Access/view.jsp +++ b/war/WEB-INF/View/Access/view.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> -<%@ page import="model.entity.*"%> +<%@ page import="model.*"%> <% Access access = (Access)request.getAttribute("access"); String role = (String)request.getAttribute("role"); diff --git a/war/WEB-INF/View/Resources/index.jsp b/war/WEB-INF/View/Resources/index.jsp index 5dbbb6b..6e05961 100644 --- a/war/WEB-INF/View/Resources/index.jsp +++ b/war/WEB-INF/View/Resources/index.jsp @@ -98,12 +98,12 @@ - - - - - - + + + + + + diff --git a/war/WEB-INF/View/Users/index.jsp b/war/WEB-INF/View/Users/index.jsp index f06e600..35a40f2 100644 --- a/war/WEB-INF/View/Users/index.jsp +++ b/war/WEB-INF/View/Users/index.jsp @@ -113,7 +113,9 @@ - +
URLStatusDate createdActions
URLStatusDate createdActions
<%= user.getName()%> <%= user.getEmail()%><%=user.getRoleName()%> + <%=user.getRoleName()%> + View diff --git a/war/WEB-INF/appengine-web.xml b/war/WEB-INF/appengine-web.xml index 41291e7..ef33bb3 100644 --- a/war/WEB-INF/appengine-web.xml +++ b/war/WEB-INF/appengine-web.xml @@ -1,7 +1,7 @@ lab08-20173373 - 1 + 2 true