Commit 586709f7 by Tuomas Riihimäki

Added getCurrentEvent to SessionHandler.java

1 parent e6d608c0
...@@ -97,8 +97,8 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -97,8 +97,8 @@ public class TestDataBean implements TestDataBeanLocal {
*/ */
public Event generateMetaData() { public Event generateMetaData() {
EventStatus status = new EventStatus(); EventStatus status = new EventStatus();
status.setStatusName("BLAAH"); status.setName("BLAAH");
eventStatusFacade.create(status); eventStatusFacade.create(status);
EventSettings settings = new EventSettings(); EventSettings settings = new EventSettings();
......
...@@ -9,12 +9,15 @@ import javax.ejb.EJB; ...@@ -9,12 +9,15 @@ import javax.ejb.EJB;
import javax.faces.bean.ManagedBean; import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped; import javax.faces.bean.SessionScoped;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import fi.insomnia.bortal.HostnameFilter; import fi.insomnia.bortal.HostnameFilter;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.RolePermission; import fi.insomnia.bortal.beans.RolePermission;
import fi.insomnia.bortal.beans.SecurityBeanLocal; import fi.insomnia.bortal.beans.SecurityBeanLocal;
import fi.insomnia.bortal.beans.SessionHandlerBeanLocal; import fi.insomnia.bortal.beans.SessionHandlerBeanLocal;
import fi.insomnia.bortal.model.Event;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
/** /**
...@@ -31,6 +34,9 @@ public class SessionHandler { ...@@ -31,6 +34,9 @@ public class SessionHandler {
@EJB @EJB
private SecurityBeanLocal secubean; private SecurityBeanLocal secubean;
@EJB
private EventBeanLocal eventbean;
/** Creates a new instance of SessionHandler */ /** Creates a new instance of SessionHandler */
public SessionHandler() { public SessionHandler() {
...@@ -64,6 +70,11 @@ public class SessionHandler { ...@@ -64,6 +70,11 @@ public class SessionHandler {
return ret; return ret;
} }
public Event getCurrentEvent() {
String hostname = getHostname();
return eventbean.getEventByHostname(hostname);
}
public boolean hasPermission(String target, RolePermission permission) { public boolean hasPermission(String target, RolePermission permission) {
return handlerbean.hasPermission(target, getUser(), permission); return handlerbean.hasPermission(target, getUser(), permission);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!