Commit 368c00b6 by Tuukka Kivilahti

Bugfix: place.placeReserveTime was NOT set null on place release.

Fixed, made also feature what allows fixing place with nasty status
1 parent dfa2ee61
......@@ -492,9 +492,13 @@ public class PlaceBean implements PlaceBeanLocal {
@Override
@RolesAllowed({ MapPermission.S_BUY_PLACES, MapPermission.S_MANAGE_OTHERS })
public boolean releasePlace(Place place) {
place = placeFacade.find(place.getId());
place = placeFacade.reload(place);
EventUser user = permbean.getCurrentUser();
if (place.getGroup() != null || place.getCurrentUser() == null || (!permbean.hasPermission(MapPermission.MANAGE_OTHERS) && !place.getCurrentUser().equals(user))) {
if(place.getReserveTime() != null && place.getCurrentUser() == null && place.getGroup() == null && place.getPlaceReserver() == null)
place.setReserveTime(null); // there was a bug, with this you can fix what it broke
return false;
}
place.setCurrentUser(null);
......@@ -541,6 +545,7 @@ public class PlaceBean implements PlaceBeanLocal {
}
place.setGroup(null);
place.setCurrentUser(null);
place.setReserveTime(null);
if (place.getPlaceReserver() != null)
{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!