Commit 0eda61d3 by Tuomas Riihimäki

Merge branch 'place_slot_remove_fix' into 'master'

Place slot remove fix

Muokataan placeslotista paikka tyhjäksi silloin kun siihen sidottu paikka vapautetaan. PlaceSlot jää kuitenkin "käytetyksi" -> näille vois tehdä joskus muokkaimen tai jotain.

See merge request !152
2 parents cc731e52 fd6cc3e5
......@@ -619,9 +619,10 @@ public class PlaceBean implements PlaceBeanLocal {
gmemfacade.remove(res);
}
PlaceSlot slot = placeSlotFacade.findSlotForPlace(place);
// remove also slot from place
if(place.getReserverSlot() != null) {
PlaceSlot slot = placeSlotFacade.reload(place.getReserverSlot());
if(slot != null) {
slot.setPlace(null);
place.setReserverSlot(null);
}
......
......@@ -310,6 +310,10 @@ public class Place extends GenericEntity implements Comparable<Place> {
return buyable;
}
/**
* NOTE: you can newer be sure that this is up to date
* @return
*/
public PlaceSlot getReserverSlot() {
return reserverSlot;
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!