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

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

@@ -25,7 +25,6 @@ import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.Role;
 import fi.insomnia.bortal.model.Role;
-import fi.insomnia.bortal.model.User;
 
 
 /**
 /**
  * Session Bean implementation class AccountEventBean
  * Session Bean implementation class AccountEventBean
@@ -95,7 +94,7 @@ public class AccountEventBean implements AccountEventBeanLocal {
 	public void shopCash(EventUser shoppingUser, Map<Product, BigDecimal> shopMap, boolean buyInstant) {
 	public void shopCash(EventUser shoppingUser, Map<Product, BigDecimal> shopMap, boolean buyInstant) {
 		logger.debug("Shoping cash. buyinstant {}", buyInstant);
 		logger.debug("Shoping cash. buyinstant {}", buyInstant);
 		EventUser seller = permbean.getCurrentUser();
 		EventUser seller = permbean.getCurrentUser();
-		shoppingUser = userbean.findEventUserById(shoppingUser.getId());
+		shoppingUser = userbean.findByEventUserId(shoppingUser.getId());
 
 
 		BigDecimal tot = BigDecimal.ZERO;
 		BigDecimal tot = BigDecimal.ZERO;
 
 

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

@@ -298,11 +298,11 @@ public class UserBean implements UserBeanLocal {
 		return true;
 		return true;
 	}
 	}
 
 
-	@Override
-	@RolesAllowed(UserPermission.S_VIEW_ALL)
-	public User findById(Integer id) {
-		return userFacade.find(id);
-	}
+	// @Override
+	// @RolesAllowed(UserPermission.S_VIEW_ALL)
+	// public User findById(Integer id) {
+	// return userFacade.find(id);
+	// }
 
 
 	@Override
 	@Override
 	@RolesAllowed(UserPermission.S_VIEW_ALL)
 	@RolesAllowed(UserPermission.S_VIEW_ALL)
@@ -407,7 +407,7 @@ public class UserBean implements UserBeanLocal {
 	}
 	}
 
 
 	@Override
 	@Override
-	public EventUser findEventUserById(Integer integer) {
+	public EventUser findByEventUserId(Integer integer) {
 		return eventUserFacade.find(integer);
 		return eventUserFacade.find(integer);
 	}
 	}
 
 
@@ -435,4 +435,15 @@ public class UserBean implements UserBeanLocal {
 		}
 		}
 		return ret;
 		return ret;
 	}
 	}
+
+	@Override
+	public EventUser findByUserId(Integer userid) {
+		User user = userFacade.find(userid);
+		EventUser ret = null;
+		if (user != null)
+		{
+			ret = this.getEventUser(user);
+		}
+		return ret;
+	}
 }
 }

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

@@ -33,9 +33,9 @@ public interface UserBeanLocal {
 
 
 	boolean initPasswordReset(String user, String mailpath);
 	boolean initPasswordReset(String user, String mailpath);
 
 
-	User findById(Integer integer);
+	EventUser findByUserId(Integer userid);
 
 
-	EventUser findEventUserById(Integer integer);
+	EventUser findByEventUserId(Integer integer);
 
 
 	GroupMembership findToken(String token);
 	GroupMembership findToken(String token);
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UploadServlet.java

@@ -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.getEventUser(userbean.findById(destId)), contenttype, imagedata, filename, description);
+				UserImage userimage = userbean.uploadImage(userbean.findByEventUserId(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/ProductShopView.java

@@ -52,7 +52,7 @@ public class ProductShopView extends GenericCDIView {
 
 
 	public void initBillView()
 	public void initBillView()
 	{
 	{
-		if (requirePermissions(ShopPermission.LIST_USERPRODUCTS)) {
+		if (requirePermissions(ShopPermission.LIST_USERPRODUCTS) && shoppingcart == null) {
 			shoppingcart = new ListDataModel<ProductShopItem>(ProductShopItem.productList(productBean.listUserShoppableProducts()));
 			shoppingcart = new ListDataModel<ProductShopItem>(ProductShopItem.productList(productBean.listUserShoppableProducts()));
 			logger.debug("Initialized billing shoppingcart to {}", shoppingcart);
 			logger.debug("Initialized billing shoppingcart to {}", shoppingcart);
 			this.beginConversation();
 			this.beginConversation();
@@ -62,7 +62,7 @@ public class ProductShopView extends GenericCDIView {
 
 
 	public void initShopView() {
 	public void initShopView() {
 
 
-		if (requirePermissions(ShopPermission.SHOP_TO_OTHERS)) {
+		if (requirePermissions(ShopPermission.SHOP_TO_OTHERS) && shoppingcart == null) {
 			shoppingcart = new ListDataModel<ProductShopItem>(ProductShopItem.productList(productBean.listUserShoppableProducts()));
 			shoppingcart = new ListDataModel<ProductShopItem>(ProductShopItem.productList(productBean.listUserShoppableProducts()));
 			logger.debug("Initialized shoppingcart to {}", shoppingcart);
 			logger.debug("Initialized shoppingcart to {}", shoppingcart);
 			this.beginConversation();
 			this.beginConversation();

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java

@@ -88,7 +88,7 @@ public class UserView extends GenericCDIView {
 	public EventUser 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.findEventUserById(userid);
+				user = userbean.findByUserId(userid);
 			} else {
 			} else {
 				user = getCurrentUser();
 				user = getCurrentUser();
 			}
 			}

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

@@ -17,7 +17,7 @@ public class EventUserConverter extends GenericIntegerEntityConverter<EventUser>
 
 
 	@Override
 	@Override
 	protected EventUser find(Integer id) {
 	protected EventUser find(Integer id) {
-		return userbean.findEventUserById(id);
+		return userbean.findByEventUserId(id);
 	}
 	}
 
 
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/UserConverter.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.User;
-import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter;
-
-@Named
-@RequestScoped
-public class UserConverter extends GenericIntegerEntityConverter<User> {
-
-	@EJB
-	private UserBeanLocal userbean;
-
-	@Override
-	protected User find(Integer id) {
-		return userbean.findById(id);
-	}
-
-}