Merge pull request #187 from andersinno/python3-6-fix

jopesy · web-flow · commit f57ee6840a53 · 2024-12-17T10:54:59.000+02:00
Fix Python 3.6 compatibility issue with code
diff --git a/resources/models/reservation.py b/resources/models/reservation.py
@@ -711,7 +711,8 @@ def clean(self, **kwargs):
             )
             # Exclude current reservation from the valid_reservations_for_same_unit list to allow user to 
             # update reservation if new times overlaps only with the original times of the same reservation
-            if original_reservation := kwargs.get("original_reservation", None):
+            original_reservation = kwargs.get("original_reservation", None)
+            if original_reservation:
                 valid_reservations_for_same_unit = valid_reservations_for_same_unit.exclude(id=original_reservation.id)
 
             user_has_conflicting_reservations = valid_reservations_for_same_unit.filter(

Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,8 @@ def clean(self, **kwargs):`
`711`	`711`	`)`
`712`	`712`	`# Exclude current reservation from the valid_reservations_for_same_unit list to allow user to`
`713`	`713`	`# update reservation if new times overlaps only with the original times of the same reservation`
`714`		`- if original_reservation := kwargs.get("original_reservation", None):`
	`714`	`+ original_reservation = kwargs.get("original_reservation", None)`
	`715`	`+ if original_reservation:`
`715`	`716`	`valid_reservations_for_same_unit = valid_reservations_for_same_unit.exclude(id=original_reservation.id)`
`716`	`717`
`717`	`718`	`user_has_conflicting_reservations = valid_reservations_for_same_unit.filter(`