Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java

@@ -107,8 +107,6 @@ public class UserBean implements UserBeanLocal {
 	@EJB
 	private PlaceGroupFacade pgfacade;
 
-	private EventUserFacade eventUserFacade;
-
 	@Override
 	@RolesAllowed(UserPermission.S_VIEW_ALL)
 	public List<User> getUsers() {
@@ -132,7 +130,7 @@ public class UserBean implements UserBeanLocal {
 	}
 
 	@Override
-	public List<Role> findUsersRoles(User u) {
+	public List<Role> findUsersRoles(EventUser u) {
 		IUser currusr = permbean.getCurrentUser();
 		if (!currusr.equals(u) && !permbean.hasPermission(UserPermission.MODIFY)) {
 			loggerbean.logMessage(SecurityLogType.permissionDenied, permbean.getCurrentUser(), "User tried to fetc another users roles: " + u);
@@ -143,7 +141,7 @@ public class UserBean implements UserBeanLocal {
 
 	}
 
-	public List<Role> localFindUsersRoles(User u) {
+	public List<Role> localFindUsersRoles(EventUser u) {
 		Set<Role> checkedRoles = new HashSet<Role>();
 		if (u != null)
 		{
@@ -396,7 +394,7 @@ public class UserBean implements UserBeanLocal {
 
 	@Override
 	@RolesAllowed(UserPermission.S_CREATE_NEW)
-	public void createNewUser(User usr) {
+	public EventUser createNewUser(User usr) {
 		EventUser evu = new EventUser(usr, eventBean.getCurrentEvent());
 		eventUserFacade.create(evu);
 		return evu;

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/RoleFacade.java

@@ -10,10 +10,10 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
 import fi.insomnia.bortal.beans.EventBeanLocal;
+import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.LanEvent;
 import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.model.Role_;
-import fi.insomnia.bortal.model.User;
 
 @Stateless
 @LocalBean
@@ -35,7 +35,7 @@ public class RoleFacade extends IntegerPkGenericFacade<Role> {
 	// return getSingleNullableResult(q);
 	// }
 
-	public List<Role> findForUser(User user) {
+	public List<Role> findForUser(EventUser user) {
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<Role> cq = cb.createQuery(Role.class);
 		Root<Role> root = cq.from(Role.class);

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/SitePageFacade.java

@@ -13,6 +13,7 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import fi.insomnia.bortal.beans.EventBeanLocal;
+import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.PageContent;
 import fi.insomnia.bortal.model.PageContent_;
@@ -20,7 +21,6 @@ import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.model.Role_;
 import fi.insomnia.bortal.model.SitePage;
 import fi.insomnia.bortal.model.SitePage_;
-import fi.insomnia.bortal.model.User;
 
 @Stateless
 public class SitePageFacade extends IntegerPkGenericFacade<SitePage> {
@@ -50,7 +50,7 @@ public class SitePageFacade extends IntegerPkGenericFacade<SitePage> {
 		CriteriaQuery<SitePage> cq = cb.createQuery(SitePage.class);
 		Root<SitePage> root = cq.from(SitePage.class);
 
-		ListJoin<Role, User> usrpath = root.join(SitePage_.allowedRoles).join(Role_.users);
+		ListJoin<Role, EventUser> usrpath = root.join(SitePage_.allowedRoles).join(Role_.users);
 
 		Path<SitePage> parentpath = root.get(SitePage_.parent);
 		Predicate rootpred = null;

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UserBeanLocal.java

@@ -33,12 +33,10 @@ public interface UserBeanLocal {
 
 	boolean initPasswordReset(String user, String mailpath);
 
-	List<Role> findUsersRoles(User u);
-
 	User findById(Integer integer);
 
 	EventUser findEventUserById(Integer integer);
-	
+
 	GroupMembership findToken(String token);
 
 	void createFromToken(User user, String token);
@@ -47,7 +45,7 @@ public interface UserBeanLocal {
 
 	UserImage saveCroppedImage(UserImage currentImage, int left, int top, int width, int height) throws IOException;
 
-	void createNewUser(User usr);
+	EventUser createNewUser(User usr);
 
 	boolean userExists(String login);
 
@@ -55,4 +53,6 @@ public interface UserBeanLocal {
 
 	EventUser mergeEventUserChanges(EventUser shoppingUser);
 
+	List<Role> findUsersRoles(EventUser u);
+
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/EventUserConverter.java

+package fi.insomnia.bortal.web.converter;
+
+import javax.ejb.EJB;
+import javax.faces.bean.RequestScoped;
+import javax.inject.Named;
+
+import fi.insomnia.bortal.beans.UserBeanLocal;
+import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter;
+
+@Named
+@RequestScoped
+public class EventUserConverter extends GenericIntegerEntityConverter<EventUser> {
+
+	@EJB
+	private UserBeanLocal userbean;
+
+	@Override
+	protected EventUser find(Integer id) {
+		return userbean.findEventUserById(id);
+	}
+
+}

code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/UserConverter.java

@@ -5,7 +5,6 @@ import javax.faces.bean.RequestScoped;
 import javax.inject.Named;
 
 import fi.insomnia.bortal.beans.UserBeanLocal;
-import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter;
 
@@ -17,7 +16,7 @@ public class UserConverter extends GenericIntegerEntityConverter<User> {
 	private UserBeanLocal userbean;
 
 	@Override
-	protected IUser find(Integer id) {
+	protected User find(Integer id) {
 		return userbean.findById(id);
 	}