Commit e09f6ef3 by Tuomas Riihimäki

Le fix...

1 parent 8901b274
...@@ -306,8 +306,8 @@ public class UserBean implements UserBeanLocal { ...@@ -306,8 +306,8 @@ public class UserBean implements UserBeanLocal {
@Override @Override
@RolesAllowed(UserPermission.S_VIEW_ALL) @RolesAllowed(UserPermission.S_VIEW_ALL)
public SearchResult<EventUser> getUsers(int page, int pagesize, String sort, String search) { public SearchResult<User> getUsers(int page, int pagesize, String sort, String search) {
return eventUserFacade.searchUser(page, pagesize, sort, search); return userFacade.searchUser(page, pagesize, sort, search);
} }
// @Override // @Override
......
...@@ -52,7 +52,7 @@ public class PlaceView extends GenericCDIView { ...@@ -52,7 +52,7 @@ public class PlaceView extends GenericCDIView {
private EventMap currentMap; private EventMap currentMap;
private String searchuser; private String searchuser;
private transient ListDataModel<EventUser> userlist; private transient ListDataModel<User> userlist;
@EJB @EJB
private AccountEventBeanLocal acbean; private AccountEventBeanLocal acbean;
...@@ -136,8 +136,8 @@ public class PlaceView extends GenericCDIView { ...@@ -136,8 +136,8 @@ public class PlaceView extends GenericCDIView {
public String reserveForUser() { public String reserveForUser() {
try { try {
EventUser user = userlist.getRowData(); EventUser user = userbean.getEventUser(userlist.getRowData());
if (placebean.reservePlace(place, userlist.getRowData())) { if (placebean.reservePlace(place, user)) {
placebean.buySelectedPlaces(user); placebean.buySelectedPlaces(user);
} }
...@@ -152,7 +152,7 @@ public class PlaceView extends GenericCDIView { ...@@ -152,7 +152,7 @@ public class PlaceView extends GenericCDIView {
public String searchUser() { public String searchUser() {
super.beginConversation(); super.beginConversation();
userlist = new ListDataModel<EventUser>(userbean.getUsers(0, 0, null, searchuser).getResults()); userlist = new ListDataModel<User>(userbean.getUsers(0, 0, null, searchuser).getResults());
return null; return null;
} }
...@@ -190,11 +190,11 @@ public class PlaceView extends GenericCDIView { ...@@ -190,11 +190,11 @@ public class PlaceView extends GenericCDIView {
return searchuser; return searchuser;
} }
public void setUserlist(ListDataModel<EventUser> userlist) { public void setUserlist(ListDataModel<User> userlist) {
this.userlist = userlist; this.userlist = userlist;
} }
public ListDataModel<EventUser> getUserlist() { public ListDataModel<User> getUserlist() {
return userlist; return userlist;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!