Merge branch 'restDeleteFix' into 'master'

Fix rest place removing

Add missing remove function, and more informative responses to http.

See merge request !327

code/moya-beans/ejbModule/fi/codecrew/moya/beans/EventMapBean.java

@@ -53,9 +53,10 @@ public class EventMapBean implements EventMapBeanLocal {
 	@EJB
 	@EJB
 	private PlaceFacade placefacade;
 	private PlaceFacade placefacade;
 
 
-	private static final Logger logger = LoggerFactory.getLogger(EventMapBean.class);
-
+	@EJB
+	private PermissionBeanLocal permbean;
 
 
+	private static final Logger logger = LoggerFactory.getLogger(EventMapBean.class);
 
 
 	@Override
 	@Override
 	@RolesAllowed(MapPermission.S_MANAGE_MAPS)
 	@RolesAllowed(MapPermission.S_MANAGE_MAPS)
@@ -110,6 +111,7 @@ public class EventMapBean implements EventMapBeanLocal {
 		if (!currentEvent.equals(place.getMap().getEvent())) {
 		if (!currentEvent.equals(place.getMap().getEvent())) {
 			throw new EJBAccessException("Deleting placce for wrong event!");
 			throw new EJBAccessException("Deleting placce for wrong event!");
 		}
 		}
+		placefacade.remove(place);
 	}
 	}
 
 
 	@Override
 	@Override
@@ -119,7 +121,8 @@ public class EventMapBean implements EventMapBeanLocal {
 		Place place = placefacade.find(id);
 		Place place = placefacade.find(id);
 		LanEvent currentEvent = eventbean.getCurrentEvent();
 		LanEvent currentEvent = eventbean.getCurrentEvent();
 		if (!currentEvent.equals(place.getMap().getEvent())) {
 		if (!currentEvent.equals(place.getMap().getEvent())) {
-			throw new EJBAccessException("Fetcing place for wrong event!");
+			logger.warn("Tried to fetch place from wrong event!: user {}, place: {}, event {}", permbean.getCurrentUser(), place, currentEvent);
+			place = null;
 		}
 		}
 		return place;
 		return place;
 	}
 	}