Commit a49e1cf4 by Billy Larru

omitiendo en el filtro a todos los modales de la carpeta vistas/modals

parent e019a7ce
...@@ -35,7 +35,6 @@ import org.json.JSONObject; ...@@ -35,7 +35,6 @@ import org.json.JSONObject;
*/ */
public class RequestsFilter implements Filter { public class RequestsFilter implements Filter {
private FilterConfig filterConfig = null; private FilterConfig filterConfig = null;
public RequestsFilter() { public RequestsFilter() {
...@@ -46,13 +45,19 @@ public class RequestsFilter implements Filter { ...@@ -46,13 +45,19 @@ public class RequestsFilter implements Filter {
HttpServletRequest request = (HttpServletRequest) req; HttpServletRequest request = (HttpServletRequest) req;
HttpServletResponse response = (HttpServletResponse) resp; HttpServletResponse response = (HttpServletResponse) resp;
String uri = request.getRequestURI(); String uri = request.getRequestURI();
if(uri.endsWith("vistas/index.jsp")){
if (uri.contains("vistas/modals/")) {
chain.doFilter(req, resp);
return;
}
if (uri.endsWith("vistas/index.jsp")) {
if (request.getSession().getAttribute("codigo") != null) { if (request.getSession().getAttribute("codigo") != null) {
response.sendRedirect("main.jsp"); response.sendRedirect("main.jsp");
return; return;
} }
chain.doFilter(req, resp); chain.doFilter(req, resp);
}else{ } else {
if (request.getSession().getAttribute("codigo") != null) { if (request.getSession().getAttribute("codigo") != null) {
if (uri.endsWith(".jsp")) { if (uri.endsWith(".jsp")) {
HttpSession session = request.getSession(); HttpSession session = request.getSession();
...@@ -88,7 +93,7 @@ public class RequestsFilter implements Filter { ...@@ -88,7 +93,7 @@ public class RequestsFilter implements Filter {
} }
session.setAttribute("menu", menu.toString()); session.setAttribute("menu", menu.toString());
} else { } else {
deleteCredenciales(response,request); deleteCredenciales(response, request);
request.getSession().setAttribute("error", "no tiene credenciales validas"); request.getSession().setAttribute("error", "no tiene credenciales validas");
request.getRequestDispatcher("/vistas/error.jsp").forward(request, response); request.getRequestDispatcher("/vistas/error.jsp").forward(request, response);
return; return;
...@@ -101,13 +106,14 @@ public class RequestsFilter implements Filter { ...@@ -101,13 +106,14 @@ public class RequestsFilter implements Filter {
} }
chain.doFilter(request, response); chain.doFilter(request, response);
} else { } else {
deleteCredenciales(response,request); deleteCredenciales(response, request);
request.getSession().setAttribute("error","no tiene una sesion activa"); request.getSession().setAttribute("error", "no tiene una sesion activa");
request.getRequestDispatcher("/vistas/error.jsp").forward(request, response); request.getRequestDispatcher("/vistas/error.jsp").forward(request, response);
} }
} }
} }
private void deleteCredenciales(HttpServletResponse response,HttpServletRequest request) {
private void deleteCredenciales(HttpServletResponse response, HttpServletRequest request) {
request.getSession().invalidate(); request.getSession().invalidate();
Cookie cookieAuth = new Cookie("Authorization", ""); Cookie cookieAuth = new Cookie("Authorization", "");
cookieAuth.setMaxAge(0); cookieAuth.setMaxAge(0);
...@@ -125,6 +131,7 @@ public class RequestsFilter implements Filter { ...@@ -125,6 +131,7 @@ public class RequestsFilter implements Filter {
builder = Response.status(Response.Status.UNAUTHORIZED).entity(response); builder = Response.status(Response.Status.UNAUTHORIZED).entity(response);
throw new WebApplicationException(builder.build()); throw new WebApplicationException(builder.build());
} }
private void doAfterProcessing(ServletRequest request, ServletResponse response) private void doAfterProcessing(ServletRequest request, ServletResponse response)
throws IOException, ServletException { throws IOException, ServletException {
...@@ -160,16 +167,11 @@ public class RequestsFilter implements Filter { ...@@ -160,16 +167,11 @@ public class RequestsFilter implements Filter {
FilterChain chain) FilterChain chain)
throws IOException, ServletException { throws IOException, ServletException {
doBeforeProcessing(request, response, chain); doBeforeProcessing(request, response, chain);
// chain.doFilter(request, response); // chain.doFilter(request, response);
doAfterProcessing(request, response); doAfterProcessing(request, response);
} }
/** /**
......
<link href="https://fonts.googleapis.com/css?family=Roboto:400,300,100,500,700,900" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/icons/icomoon/styles.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/icons/fontawesome/styles.min.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/bootstrap.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/core.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/components.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/colors.css" rel="stylesheet" type="text/css">
<link href="../css/general.css" rel="stylesheet" type="text/css"/>
<div class="row">
<div class="form-group col-md-12">
<label>Fecha de asistencia</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input class="form-control" type="text" id="dpAsistencia" data-provide="datepicker-inline" disabled>
</div>
</div>
</div>
<div class="row">
<div class="form-group col-md-12">
<label>Policia</label>
<span class="label label-left border-left-primary label-striped form-control" id="spanNombres"></span>
</div>
</div>
<div class="row">
<div class="form-group col-md-12">
<label style="font-size: small">
Tipo de registro:
</label>
<span class="text-danger"> (*)</span>
<select id="cboTipoRegistro" class="form-control">
<option value="0">[SELECCIONE]</option>
<option value="1">Registro Autorizado</option>
<option value="3">Falta con Aviso</option>
<option value="4">Falta sin Aviso</option>
</select>
</div>
</div>
<div class="row" id="divFiltro">
</div>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment