Merge branch 'return-entrytickets' into 'master'

Fix fetch all to return places without a map (ie, entry tickets)

See merge request !379

code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java

@@ -159,10 +159,17 @@ 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);
 
 
-		Path<EventMap> map = root.get(Place_.map);
+		Join<Place, EventMap> map = root.join(Place_.map, JoinType.LEFT);
+		Join<Place, Product> product = root.join(Place_.product, JoinType.LEFT);
 		cq.where(
 		cq.where(
-			cb.isTrue(map.get(EventMap_.active)),
-			cb.equal(map.get(EventMap_.event), event)
+			cb.or(
+				cb.isNull(map),
+				cb.isTrue(map.get(EventMap_.active))
+			),
+			cb.or(
+				cb.equal(product.get(Product_.event), event),
+				cb.equal(map.get(EventMap_.event), event)
+			)
 		);
 		);
 		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();