From 7e1bcdf62206a81f7efe8ad256acfa8ce5036ecd Mon Sep 17 00:00:00 2001 From: SpeedProg Date: Thu, 15 Mar 2018 11:40:39 +0100 Subject: [PATCH 1/2] fixed query for clearing a waitlist group failing, because the ORM could not evaluate it to update the cache --- waitlist/blueprints/settings/fleetoptions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waitlist/blueprints/settings/fleetoptions.py b/waitlist/blueprints/settings/fleetoptions.py index a0b10c8b..ba942486 100644 --- a/waitlist/blueprints/settings/fleetoptions.py +++ b/waitlist/blueprints/settings/fleetoptions.py @@ -342,7 +342,7 @@ def clear_waitlist(gid): for wl in group.waitlists: waitlist_ids.append(wl.id) - db.session.query(WaitlistEntry).filter(WaitlistEntry.waitlist_id.in_(waitlist_ids)).delete() + db.session.query(WaitlistEntry).filter(WaitlistEntry.waitlist_id.in_(waitlist_ids)).delete(synchronize_session=False) db.session.commit() flash("Waitlists were cleared!", "danger") From 41b1683d832e8ca93551e18eacd45903e026a4c3 Mon Sep 17 00:00:00 2001 From: SpeedProg Date: Thu, 15 Mar 2018 11:42:21 +0100 Subject: [PATCH 2/2] updates for v1.2.3 --- CHANGELOG.md | 3 +++ waitlist/data/version.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3759a4db..f366658a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ #Changelog +* 1.2.3 + * Fixes + * Waitlist Group can not be cleared * 1.2.2 * Fixes * Fixed eve mail part not working diff --git a/waitlist/data/version.py b/waitlist/data/version.py index 80ddc355..ad589ede 100644 --- a/waitlist/data/version.py +++ b/waitlist/data/version.py @@ -1 +1 @@ -version = "1.2.2-$Format:%h$" +version = "1.2.3-$Format:%h$"