merge request commentit korjattu :)

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java

@@ -380,7 +380,6 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 		if (markUserPlacesDelivered) {
 		if (markUserPlacesDelivered) {
 			for (GroupMembership membership : gmFacade.findMemberships(user)) {
 			for (GroupMembership membership : gmFacade.findMemberships(user)) {
 				membership.setEnteredEvent(Calendar.getInstance());
 				membership.setEnteredEvent(Calendar.getInstance());
-				gmFacade.merge(membership);
 			}
 			}
 		}
 		}
 
 
@@ -389,12 +388,13 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 
 
 	@Override
 	@Override
 	public void removeCardCode(CardCode code) {
 	public void removeCardCode(CardCode code) {
-		code = cardCodeFacade.merge(code);
+		code = cardCodeFacade.reload(code);
 		
 		
 		if(code.getPrintedCard().getCardCodes().contains(code)) {
 		if(code.getPrintedCard().getCardCodes().contains(code)) {
 			code.getPrintedCard().getCardCodes().remove(code);
 			code.getPrintedCard().getCardCodes().remove(code);
-			cardCodeFacade.remove(code);
 		}
 		}
+		
+		cardCodeFacade.remove(code);
 	}	
 	}	
 	
 	
 	
 	

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java

@@ -178,8 +178,6 @@ public class ReaderBean implements ReaderBeanLocal {
 
 
 		code = cardCodeFacade.create(code);
 		code = cardCodeFacade.create(code);
 		card.getCardCodes().add(code);
 		card.getCardCodes().add(code);
-		
-		card = cardfacade.merge(card);
 
 
 		return readerEvent;
 		return readerEvent;
 	}
 	}

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java

@@ -134,7 +134,7 @@ public class PlaceFacade extends IntegerPkGenericFacade<Place> {
 		CriteriaQuery<Place> cq = cb.createQuery(Place.class);
 		CriteriaQuery<Place> cq = cb.createQuery(Place.class);
 		Root<Place> root = cq.from(Place.class);
 		Root<Place> root = cq.from(Place.class);
 		cq.where( cb.equal(root.get(Place_.map).get(EventMap_.event), eventBean.getCurrentEvent()));
 		cq.where( cb.equal(root.get(Place_.map).get(EventMap_.event), eventBean.getCurrentEvent()));
-		//cq.orderBy(cb.asc(root.get(Place_.name)));
+		cq.orderBy(cb.asc(root.get(Place_.name)));
 		return getEm().createQuery(cq).getResultList();
 		return getEm().createQuery(cq).getResultList();
 	}
 	}
 }
 }