le fix

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java

@@ -20,6 +20,7 @@ import fi.insomnia.bortal.beans.UserBeanLocal;
 import fi.insomnia.bortal.enums.apps.MapPermission;
 import fi.insomnia.bortal.enums.apps.MapPermission;
 import fi.insomnia.bortal.exceptions.BortalCatchableException;
 import fi.insomnia.bortal.exceptions.BortalCatchableException;
 import fi.insomnia.bortal.model.EventMap;
 import fi.insomnia.bortal.model.EventMap;
+import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.Place;
 import fi.insomnia.bortal.model.Place;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.web.annotations.SelectedUser;
 import fi.insomnia.bortal.web.annotations.SelectedUser;
@@ -45,13 +46,13 @@ public class PlaceView extends GenericCDIView {
 
 
 	@Inject
 	@Inject
 	@SelectedUser
 	@SelectedUser
-	private User user;
+	private EventUser user;
 
 
 	@Inject
 	@Inject
 	private EventMap currentMap;
 	private EventMap currentMap;
 
 
 	private String searchuser;
 	private String searchuser;
-	private transient ListDataModel<User> userlist;
+	private transient ListDataModel<EventUser> userlist;
 	@EJB
 	@EJB
 	private AccountEventBeanLocal acbean;
 	private AccountEventBeanLocal acbean;
 
 
@@ -135,7 +136,7 @@ public class PlaceView extends GenericCDIView {
 	public String reserveForUser() {
 	public String reserveForUser() {
 
 
 		try {
 		try {
-			User user = userlist.getRowData();
+			EventUser user = userlist.getRowData();
 			if (placebean.reservePlace(place, userlist.getRowData())) {
 			if (placebean.reservePlace(place, userlist.getRowData())) {
 				placebean.buySelectedPlaces(user);
 				placebean.buySelectedPlaces(user);
 			}
 			}
@@ -151,7 +152,7 @@ public class PlaceView extends GenericCDIView {
 
 
 	public String searchUser() {
 	public String searchUser() {
 		super.beginConversation();
 		super.beginConversation();
-		userlist = new ListDataModel<User>(userbean.getUsers(0, 0, null, searchuser).getResults());
+		userlist = new ListDataModel<EventUser>(userbean.getUsers(0, 0, null, searchuser).getResults());
 		return null;
 		return null;
 	}
 	}
 
 
@@ -189,11 +190,11 @@ public class PlaceView extends GenericCDIView {
 		return searchuser;
 		return searchuser;
 	}
 	}
 
 
-	public void setUserlist(ListDataModel<User> userlist) {
+	public void setUserlist(ListDataModel<EventUser> userlist) {
 		this.userlist = userlist;
 		this.userlist = userlist;
 	}
 	}
 
 
-	public ListDataModel<User> getUserlist() {
+	public ListDataModel<EventUser> getUserlist() {
 		return userlist;
 		return userlist;
 	}
 	}
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/TokenView.java

@@ -7,7 +7,7 @@ import javax.inject.Named;
 
 
 import fi.insomnia.bortal.beans.PlaceGroupBeanLocal;
 import fi.insomnia.bortal.beans.PlaceGroupBeanLocal;
 import fi.insomnia.bortal.enums.apps.MapPermission;
 import fi.insomnia.bortal.enums.apps.MapPermission;
-import fi.insomnia.bortal.model.IUser;
+import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.web.annotations.SelectedUser;
 import fi.insomnia.bortal.web.annotations.SelectedUser;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 
 
@@ -21,7 +21,7 @@ public class TokenView extends GenericCDIView {
 
 
 	@Inject
 	@Inject
 	@SelectedUser
 	@SelectedUser
-	private IUser user;
+	private EventUser user;
 
 
 	@EJB
 	@EJB
 	private transient PlaceGroupBeanLocal placegroupbean;
 	private transient PlaceGroupBeanLocal placegroupbean;