Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 90c4bd07 by Tuomas Riihimäki
Options

lefix

1 parent 5a7124c9
Inline Side-by-side
Showing with 30 additions and 20 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -109,9 +109,9 @@ public class UserBean implements UserBeanLocal { ...@@ -109,9 +109,9 @@ public class UserBean implements UserBeanLocal {
@Override @Override
@RolesAllowed(UserPermission.S_VIEW_ALL) @RolesAllowed(UserPermission.S_VIEW_ALL)
public List<User> getUsers() { public List<EventUser> getUsers() {
List<User> ret = userFacade.findAll(); List<EventUser> ret = eventUserFacade.findAll();
return ret; return ret;
} }
...@@ -191,7 +191,7 @@ public class UserBean implements UserBeanLocal { ...@@ -191,7 +191,7 @@ public class UserBean implements UserBeanLocal {
user = eventUserFacade.merge(user); user = eventUserFacade.merge(user);
logger.debug("uploading image to userid {}", user); logger.debug("uploading image to userid {}", user);
IUser curruser = permbean.getCurrentUser(); EventUser curruser = permbean.getCurrentUser();
if (!curruser.equals(user) && !permbean.hasPermission(UserPermission.MODIFY)) { if (!curruser.equals(user) && !permbean.hasPermission(UserPermission.MODIFY)) {
loggerbean.logMessage(SecurityLogType.permissionDenied, curruser, "user tried to save picture to userid " + user + " without sufficient permissions!"); loggerbean.logMessage(SecurityLogType.permissionDenied, curruser, "user tried to save picture to userid " + user + " without sufficient permissions!");
throw new EJBAccessException("No permission to upload image as another user"); throw new EJBAccessException("No permission to upload image as another user");
...@@ -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<User> getUsers(int page, int pagesize, String sort, String search) { public SearchResult<EventUser> getUsers(int page, int pagesize, String sort, String search) {
return userFacade.searchUser(page, pagesize, sort, search); return eventUserFacade.searchUser(page, pagesize, sort, search);
} }
// @Override // @Override
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/LoggingBeanLocal.java
...@@ -10,6 +10,7 @@ import fi.insomnia.bortal.model.User; ...@@ -10,6 +10,7 @@ import fi.insomnia.bortal.model.User;
public interface LoggingBeanLocal { public interface LoggingBeanLocal {
LogEntry logMessage(SecurityLogType paramType, User user, String... description); LogEntry logMessage(SecurityLogType paramType, User user, String... description);
LogEntry logMessage(SecurityLogType paramType, EventUser user, String... description); LogEntry logMessage(SecurityLogType paramType, EventUser user, String... description);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UserBeanLocal.java
...@@ -15,7 +15,7 @@ import fi.insomnia.bortal.utilities.SearchResult; ...@@ -15,7 +15,7 @@ import fi.insomnia.bortal.utilities.SearchResult;
@Local @Local
public interface UserBeanLocal { public interface UserBeanLocal {
List<User> getUsers(); List<EventUser> getUsers();
SearchResult<User> getUsers(int page, int pagesize, String sort, String search); SearchResult<User> getUsers(int page, int pagesize, String sort, String search);
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/MapView.java
...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.beans.PlaceBeanLocal; ...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.beans.PlaceBeanLocal;
import fi.insomnia.bortal.beans.PlaceMapBeanLocal; import fi.insomnia.bortal.beans.PlaceMapBeanLocal;
import fi.insomnia.bortal.enums.apps.MapPermission; import fi.insomnia.bortal.enums.apps.MapPermission;
import fi.insomnia.bortal.model.EventMap; import fi.insomnia.bortal.model.EventMap;
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;
...@@ -31,7 +31,7 @@ public class MapView extends GenericCDIView { ...@@ -31,7 +31,7 @@ public class MapView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private IUser user; private EventUser user;
private EventMap activeMap; private EventMap activeMap;
...@@ -106,11 +106,11 @@ public class MapView extends GenericCDIView { ...@@ -106,11 +106,11 @@ public class MapView extends GenericCDIView {
this.activeMap = activeMap; this.activeMap = activeMap;
} }
public void setUser(IUser user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
public IUser getUser() { public EventUser getUser() {
return user; return user;
} }
} }
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java
...@@ -20,6 +20,7 @@ import fi.insomnia.bortal.beans.UserBeanLocal; ...@@ -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,7 +46,7 @@ public class PlaceView extends GenericCDIView { ...@@ -45,7 +46,7 @@ public class PlaceView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private EventUser user;
@Inject @Inject
private EventMap currentMap; private EventMap currentMap;
...@@ -135,7 +136,7 @@ public class PlaceView extends GenericCDIView { ...@@ -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);
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlacegroupView.java
...@@ -11,8 +11,8 @@ import javax.inject.Named; ...@@ -11,8 +11,8 @@ 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.EventUser;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.Place; import fi.insomnia.bortal.model.Place;
import fi.insomnia.bortal.model.PlaceGroup; import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
...@@ -28,7 +28,7 @@ public class PlacegroupView extends GenericCDIView { ...@@ -28,7 +28,7 @@ public class PlacegroupView extends GenericCDIView {
// private UserView userview; // private UserView userview;
@Inject @Inject
@SelectedUser @SelectedUser
private IUser user; private EventUser user;
@EJB @EJB
private transient PlaceGroupBeanLocal placegroupBean; private transient PlaceGroupBeanLocal placegroupBean;
...@@ -122,4 +122,12 @@ public class PlacegroupView extends GenericCDIView { ...@@ -122,4 +122,12 @@ public class PlacegroupView extends GenericCDIView {
public Place getPlace() { public Place getPlace() {
return place; return place;
} }
public EventUser getUser() {
return user;
}
public void setUser(EventUser user) {
this.user = user;
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/TokenView.java
...@@ -7,7 +7,7 @@ import javax.inject.Named; ...@@ -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 { ...@@ -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;
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserCardView.java
...@@ -7,7 +7,7 @@ import javax.inject.Inject; ...@@ -7,7 +7,7 @@ import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal; import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.model.IUser; import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
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;
...@@ -22,15 +22,15 @@ public class UserCardView extends GenericCDIView { ...@@ -22,15 +22,15 @@ public class UserCardView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private IUser user; private EventUser user;
private ListDataModel<PrintedCard> printedCards; private ListDataModel<PrintedCard> printedCards;
public IUser getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(IUser user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!