Skip to content

Max Mecklin / Moya

Go to a project
Commit afc9cb8a by Tuomas Riihimäki
Options

eventuserfiksauksia

1 parent 9714ebc9
Inline Side-by-side
Showing with 42 additions and 39 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/RoleBean.java
...@@ -24,8 +24,8 @@ import fi.insomnia.bortal.enums.apps.UserPermission; ...@@ -24,8 +24,8 @@ import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.facade.RoleFacade; import fi.insomnia.bortal.facade.RoleFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.ApplicationPermission; import fi.insomnia.bortal.model.ApplicationPermission;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User;
/** /**
* *
...@@ -168,13 +168,13 @@ public class RoleBean implements RoleBeanLocal { ...@@ -168,13 +168,13 @@ public class RoleBean implements RoleBeanLocal {
@Override @Override
@RolesAllowed(UserPermission.S_READ_ROLES) @RolesAllowed(UserPermission.S_READ_ROLES)
public List<Role> getRoles(User user) { public List<Role> getRoles(EventUser user) {
return roleFacade.findForUser(user); return roleFacade.findForUser(user);
} }
@Override @Override
@RolesAllowed(UserPermission.S_WRITE_ROLES) @RolesAllowed(UserPermission.S_WRITE_ROLES)
public void saveRoles(User usr, List<Role> usersRoles) { public void saveRoles(EventUser usr, List<Role> usersRoles) {
List<Role> allRoles = roleFacade.findAll(); List<Role> allRoles = roleFacade.findAll();
for (Role ur : allRoles) for (Role ur : allRoles)
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/CardTemplateBeanLocal.java
...@@ -6,9 +6,9 @@ import java.util.List; ...@@ -6,9 +6,9 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.CardTemplate; import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.IUser; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.utilities.jsf.EntityFinderBean; import fi.insomnia.bortal.utilities.jsf.EntityFinderBean;
@Local @Local
...@@ -20,11 +20,11 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> { ...@@ -20,11 +20,11 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
CardTemplate find(Integer id); CardTemplate find(Integer id);
PrintedCard checkPrintedCard(User user); PrintedCard checkPrintedCard(EventUser user);
void checkAllUsersCardRights(); void checkAllUsersCardRights();
PrintedCard setRfidUid(String tag, User user); PrintedCard setRfidUid(String tag, EventUser user);
PrintedCard setRfidUid(String tag, PrintedCard card); PrintedCard setRfidUid(String tag, PrintedCard card);
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/RoleBeanLocal.java
...@@ -10,8 +10,8 @@ import java.util.List; ...@@ -10,8 +10,8 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.enums.apps.IAppPermission; import fi.insomnia.bortal.enums.apps.IAppPermission;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User;
/** /**
* *
...@@ -32,8 +32,8 @@ public interface RoleBeanLocal { ...@@ -32,8 +32,8 @@ public interface RoleBeanLocal {
public Role setPermissions(Role role, List<IAppPermission> newPerms); public Role setPermissions(Role role, List<IAppPermission> newPerms);
public List<Role> getRoles(User selectedUser); public void saveRoles(EventUser usr, List<Role> usersRoles);
public void saveRoles(User usr, List<Role> usersRoles); List<Role> getRoles(EventUser user);
} }
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/UserBeanLocal.java
...@@ -19,13 +19,13 @@ public interface UserBeanLocal { ...@@ -19,13 +19,13 @@ public interface UserBeanLocal {
SearchResult<User> getUsers(int page, int pagesize, String sort, String search); SearchResult<User> getUsers(int page, int pagesize, String sort, String search);
User mergeChanges(User currentUser); EventUser mergeChanges(EventUser user);
UserImage uploadImage(User user, String contentType, byte[] image, String filename, String description); UserImage uploadImage(EventUser user, String contentType, byte[] image, String filename, String description);
UserImage findUserImage(int id); UserImage findUserImage(int id);
void createNewUser(User user, String password); void createNewUser(EventUser user, String password);
User findPasswordResetUser(Integer id, String hash); User findPasswordResetUser(Integer id, String hash);
...@@ -39,7 +39,7 @@ public interface UserBeanLocal { ...@@ -39,7 +39,7 @@ public interface UserBeanLocal {
GroupMembership findToken(String token); GroupMembership findToken(String token);
void createFromToken(User user, String token); void createFromToken(EventUser user, String token);
UserImage findUserimageFORCE(Integer id); UserImage findUserimageFORCE(Integer id);
...@@ -55,4 +55,6 @@ public interface UserBeanLocal { ...@@ -55,4 +55,6 @@ public interface UserBeanLocal {
List<Role> findUsersRoles(EventUser u); List<Role> findUsersRoles(EventUser u);
EventUser getEventUser(User user);
} }
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UploadServlet.java
...@@ -110,7 +110,7 @@ public class UploadServlet extends HttpServlet { ...@@ -110,7 +110,7 @@ public class UploadServlet extends HttpServlet {
String type = request.getParameter("type"); String type = request.getParameter("type");
if (type.equals("userimage")) { if (type.equals("userimage")) {
logger.debug("Uploading userimage for user {}"); logger.debug("Uploading userimage for user {}");
UserImage userimage = userbean.uploadImage(userbean.findById(destId), contenttype, imagedata, filename, description); UserImage userimage = userbean.uploadImage(userbean.getEventUser(userbean.findById(destId)), contenttype, imagedata, filename, description);
utilbean.convertImage(userimage.getUser()); utilbean.convertImage(userimage.getUser());
} else if (type.equals("mapimage")) { } else if (type.equals("mapimage")) {
eventmapbean.sendImage(destId, imagedata); eventmapbean.sendImage(destId, imagedata);
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/InviteAcceptView.java
...@@ -6,8 +6,8 @@ import javax.inject.Inject; ...@@ -6,8 +6,8 @@ import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
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.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
import fi.insomnia.bortal.web.cdiview.user.UserView; import fi.insomnia.bortal.web.cdiview.user.UserView;
...@@ -23,7 +23,7 @@ public class InviteAcceptView extends GenericCDIView { ...@@ -23,7 +23,7 @@ public class InviteAcceptView extends GenericCDIView {
@Inject @Inject
private UserView userview; private UserView userview;
private User user; private EventUser user;
private boolean done = false; private boolean done = false;
@EJB @EJB
...@@ -41,7 +41,7 @@ public class InviteAcceptView extends GenericCDIView { ...@@ -41,7 +41,7 @@ public class InviteAcceptView extends GenericCDIView {
this.addFaceMessage("invite.notFound"); this.addFaceMessage("invite.notFound");
done = true; done = true;
} else if (user == null) { } else if (user == null) {
user = new User(); user = new EventUser(new User(), null);
userview.setUser(user); userview.setUser(user);
super.beginConversation(); super.beginConversation();
} }
...@@ -66,11 +66,11 @@ public class InviteAcceptView extends GenericCDIView { ...@@ -66,11 +66,11 @@ public class InviteAcceptView extends GenericCDIView {
return token; return token;
} }
public void setUser(User 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/shop/ProductShopView.java
...@@ -17,8 +17,7 @@ import fi.insomnia.bortal.beans.EventBeanLocal; ...@@ -17,8 +17,7 @@ import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.ProductBeanLocal; import fi.insomnia.bortal.beans.ProductBeanLocal;
import fi.insomnia.bortal.enums.apps.ShopPermission; import fi.insomnia.bortal.enums.apps.ShopPermission;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.IUser; import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.User;
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;
import fi.insomnia.bortal.web.helpers.ProductShopItem; import fi.insomnia.bortal.web.helpers.ProductShopItem;
...@@ -43,7 +42,7 @@ public class ProductShopView extends GenericCDIView { ...@@ -43,7 +42,7 @@ public class ProductShopView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private EventUser user;
private boolean payInstant; private boolean payInstant;
...@@ -110,11 +109,11 @@ public class ProductShopView extends GenericCDIView { ...@@ -110,11 +109,11 @@ public class ProductShopView extends GenericCDIView {
return "redirBillList"; return "redirBillList";
} }
public void setUser(User 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/user/PasswordView.java
...@@ -7,8 +7,7 @@ import javax.inject.Named; ...@@ -7,8 +7,7 @@ import javax.inject.Named;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.model.IUser; import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.User;
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;
...@@ -23,7 +22,7 @@ public class PasswordView extends GenericCDIView { ...@@ -23,7 +22,7 @@ public class PasswordView extends GenericCDIView {
@Inject @Inject
@SelectedUser @SelectedUser
private User user; private EventUser user;
@EJB @EJB
private transient UserBeanLocal userbean; private transient UserBeanLocal userbean;
...@@ -45,11 +44,11 @@ public class PasswordView extends GenericCDIView { ...@@ -45,11 +44,11 @@ public class PasswordView extends GenericCDIView {
return "permissionDenied"; return "permissionDenied";
} }
public IUser getUser() { public EventUser getUser() {
return user; return user;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java
...@@ -18,11 +18,12 @@ import org.slf4j.LoggerFactory; ...@@ -18,11 +18,12 @@ import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.beans.AccountEventBeanLocal; import fi.insomnia.bortal.beans.AccountEventBeanLocal;
import fi.insomnia.bortal.beans.CardTemplateBeanLocal; import fi.insomnia.bortal.beans.CardTemplateBeanLocal;
import fi.insomnia.bortal.beans.EventBeanLocal;
import fi.insomnia.bortal.beans.RoleBeanLocal; import fi.insomnia.bortal.beans.RoleBeanLocal;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
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.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -47,7 +48,7 @@ public class UserView extends GenericCDIView { ...@@ -47,7 +48,7 @@ public class UserView extends GenericCDIView {
private CroppedImage croppedImage; private CroppedImage croppedImage;
private User user; private EventUser user;
@Inject @Inject
private transient Conversation conversation; private transient Conversation conversation;
...@@ -73,19 +74,21 @@ public class UserView extends GenericCDIView { ...@@ -73,19 +74,21 @@ public class UserView extends GenericCDIView {
private List<Role> usersRoles; private List<Role> usersRoles;
@EJB @EJB
private RoleBeanLocal rolebean; private RoleBeanLocal rolebean;
@EJB
private EventBeanLocal eventbean;
@Produces @Produces
@LoggedIn @LoggedIn
public User getCurrentUser() { public EventUser getCurrentUser() {
return permbean.getCurrentUser(); return permbean.getCurrentUser();
} }
@Produces @Produces
@SelectedUser @SelectedUser
public User getSelectedUser() { public EventUser getSelectedUser() {
if (user == null) { if (user == null) {
if (userid != null && permbean.hasPermission(UserPermission.VIEW_ALL)) { if (userid != null && permbean.hasPermission(UserPermission.VIEW_ALL)) {
user = userbean.findById(userid); user = userbean.findEventUserById(userid);
} else { } else {
user = getCurrentUser(); user = getCurrentUser();
} }
...@@ -133,7 +136,7 @@ public class UserView extends GenericCDIView { ...@@ -133,7 +136,7 @@ public class UserView extends GenericCDIView {
try { try {
newImage = userbean.saveCroppedImage(user.getCurrentImage(), newImage = userbean.saveCroppedImage(user.getCurrentImage(),
croppedImage.getLeft(), croppedImage.getTop(), croppedImage.getWidth(), croppedImage.getHeight()); croppedImage.getLeft(), croppedImage.getTop(), croppedImage.getWidth(), croppedImage.getHeight());
user = newImage.getUser(); user = userbean.getEventUser(newImage.getUser());
} catch (IOException e) { } catch (IOException e) {
logger.info("Error converting image", e); logger.info("Error converting image", e);
super.addFaceMessage("user.errorConvertingImage"); super.addFaceMessage("user.errorConvertingImage");
...@@ -155,7 +158,7 @@ public class UserView extends GenericCDIView { ...@@ -155,7 +158,7 @@ public class UserView extends GenericCDIView {
public String sendImage() { public String sendImage() {
UserImage userimage = userbean.uploadImage(user, getImage().getContentType(), getImage().getContents(), getImage().getFileName(), ""); UserImage userimage = userbean.uploadImage(user, getImage().getContentType(), getImage().getContents(), getImage().getFileName(), "");
user = userimage.getUser(); user = userbean.getEventUser(userimage.getUser());
super.addFaceMessage("user.imageUploaded"); super.addFaceMessage("user.imageUploaded");
return null; return null;
...@@ -163,7 +166,7 @@ public class UserView extends GenericCDIView { ...@@ -163,7 +166,7 @@ public class UserView extends GenericCDIView {
public void initCreateView() { public void initCreateView() {
if (super.requirePermissions(UserPermission.CREATE_NEW)) { if (super.requirePermissions(UserPermission.CREATE_NEW)) {
user = new User(); user = new EventUser(new User(), eventbean.getCurrentEvent());
super.beginConversation(); super.beginConversation();
} }
} }
...@@ -221,11 +224,11 @@ public class UserView extends GenericCDIView { ...@@ -221,11 +224,11 @@ public class UserView extends GenericCDIView {
return userid; return userid;
} }
public void setUser(User user) { public void setUser(EventUser user) {
this.user = user; this.user = user;
} }
public IUser getUser() { public EventUser getUser() {
return user; return user;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!