Merge remote-tracking branch 'origin/master' into localefix

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

@@ -617,7 +617,13 @@ public class PlaceBean implements PlaceBeanLocal {
 			place.setPlaceReserver(null);
 
 			gmemfacade.remove(res);
+		}
 
+		// remove also slot from place
+		if(place.getReserverSlot() != null) {
+			PlaceSlot slot = placeSlotFacade.reload(place.getReserverSlot());
+			slot.setPlace(null);
+			place.setReserverSlot(null);
 		}
 		return place;
 	}

code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceSlotFacade.java

@@ -103,7 +103,8 @@ public class PlaceSlotFacade extends IntegerPkGenericFacade<PlaceSlot> {
 				cb.or(cb.isNull(billexp),
 						cb.greaterThan(billexp, Calendar.getInstance())
 				),
-				cb.isNull(root.get(PlaceSlot_.place))
+				cb.isNull(root.get(PlaceSlot_.place)),
+				cb.isNull(root.get(PlaceSlot_.used))
 		);
 
 		Long count = super.getSingleNullableResult(getEm().createQuery(q));

code/moya-database/src/main/java/fi/codecrew/moya/model/Place.java

@@ -310,6 +310,14 @@ public class Place extends GenericEntity implements Comparable<Place> {
 		return buyable;
 	}
 
+	public PlaceSlot getReserverSlot() {
+		return reserverSlot;
+	}
+
+	public void setReserverSlot(PlaceSlot reserverSlot) {
+		this.reserverSlot = reserverSlot;
+	}
+
 	public void setReleaseTime(Calendar releaseTime) {
 		this.releaseTime = releaseTime;
 	}

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/PasswordView.java

@@ -58,7 +58,8 @@ public class PasswordView extends GenericCDIView {
 		boolean mod = permbean.hasPermission(UserPermission.MODIFY);
 		if (permbean.isCurrentUser(user) || mod) {
 			logger.debug("foo {}, {}", mod, user.checkPassword(oldPassword));
-			if (!mod && !user.checkPassword(oldPassword)) {
+
+			if (!user.checkPassword(oldPassword)) {
 				super.addFaceMessage("userview.oldPasswordError");
 			} else if (password == null || !password.equals(passwordcheck)) {
 				super.addFaceMessage("userview.passwordsDontMatch");