Skip to content

Codecrew / Moya

Go to a project
Commit bd251e5c by Tuukka Kivilahti
Options

näin tää on oikein korjattu

1 parent 368c00b6
Inline Side-by-side
Showing with 2 additions and 5 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java
...@@ -494,15 +494,12 @@ public class PlaceBean implements PlaceBeanLocal { ...@@ -494,15 +494,12 @@ public class PlaceBean implements PlaceBeanLocal {
public boolean releasePlace(Place place) { public boolean releasePlace(Place place) {
place = placeFacade.reload(place); 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.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
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);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!