Commit 618c744f by Tuomas Riihimäki

Merge branch 'placeReleaceBug' into 'master'

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

Fixed, made also feature what allows fixing place with nasty status

See merge request !348
2 parents dfa2ee61 bd251e5c
...@@ -492,13 +492,14 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -492,13 +492,14 @@ public class PlaceBean implements PlaceBeanLocal {
@Override @Override
@RolesAllowed({ MapPermission.S_BUY_PLACES, MapPermission.S_MANAGE_OTHERS }) @RolesAllowed({ MapPermission.S_BUY_PLACES, MapPermission.S_MANAGE_OTHERS })
public boolean releasePlace(Place place) { public boolean releasePlace(Place place) {
place = placeFacade.find(place.getId()); place = placeFacade.reload(place);
EventUser user = permbean.getCurrentUser(); EventUser user = permbean.getCurrentUser();
if (place.getGroup() != null || place.getCurrentUser() == null || (!permbean.hasPermission(MapPermission.MANAGE_OTHERS) && !place.getCurrentUser().equals(user))) {
if (place.getGroup() != null || (!permbean.hasPermission(MapPermission.MANAGE_OTHERS) && !place.getCurrentUser().equals(user))) {
return false; return false;
} }
place.setCurrentUser(null);
place.setCurrentUser(null);
place.setReserveTime(null); place.setReserveTime(null);
PlaceSlot slot = placeSlotFacade.findSlotForPlace(place); PlaceSlot slot = placeSlotFacade.findSlotForPlace(place);
...@@ -541,6 +542,7 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -541,6 +542,7 @@ public class PlaceBean implements PlaceBeanLocal {
} }
place.setGroup(null); place.setGroup(null);
place.setCurrentUser(null); place.setCurrentUser(null);
place.setReserveTime(null);
if (place.getPlaceReserver() != 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!