Skip to content
Snippets Groups Projects

Feat/add user subscription link vipsutv 342

Merged Tor-Einar Skog requested to merge feat/add-user-subscription-link-vipsutv-342 into develop
1 unresolved thread
15 files
+ 119
7
Compare changes
  • Side-by-side
  • Inline
Files
15
@@ -20,6 +20,8 @@ package no.nibio.vips.logic.controller.servlet;
@@ -20,6 +20,8 @@ package no.nibio.vips.logic.controller.servlet;
import freemarker.core.ParseException;
import freemarker.core.ParseException;
import java.io.IOException;
import java.io.IOException;
 
import java.io.UnsupportedEncodingException;
 
import java.net.URLEncoder;
import java.util.List;
import java.util.List;
import javax.ejb.EJB;
import javax.ejb.EJB;
import javax.persistence.EntityManager;
import javax.persistence.EntityManager;
@@ -80,7 +82,12 @@ public class NotificationSubscriptionController extends HttpServlet {
@@ -80,7 +82,12 @@ public class NotificationSubscriptionController extends HttpServlet {
String action = request.getParameter("action");
String action = request.getParameter("action");
VipsLogicUser user = (VipsLogicUser) request.getSession().getAttribute("user");
VipsLogicUser user = (VipsLogicUser) request.getSession().getAttribute("user");
if(user == null)
 
{
 
this.redirectToLogin(request, response);
 
return;
 
}
 
try
try
{
{
// Default: View list of user subscriptions
// Default: View list of user subscriptions
@@ -173,6 +180,13 @@ public class NotificationSubscriptionController extends HttpServlet {
@@ -173,6 +180,13 @@ public class NotificationSubscriptionController extends HttpServlet {
}
}
}
}
 
private void redirectToLogin(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException
 
{
 
String nextPage = ServletUtil.getFullRequestURI(request);
 
String nextPageDirective= "?nextPage=" + URLEncoder.encode(nextPage, "UTF-8");
 
response.sendRedirect(Globals.PROTOCOL + "://" + ServletUtil.getServerName(request) + "/login" + nextPageDirective);
 
}
 
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
/**
/**
* Handles the HTTP <code>GET</code> method.
* Handles the HTTP <code>GET</code> method.
Loading