From d550efbf8fb922eab16fd91250a8da5e7f9a1e1b Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 21 Mar 2018 13:55:21 -0500 Subject: [PATCH] Fix default selection bug for store/department time sheet filters --- tailbone/views/shifts/lib.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tailbone/views/shifts/lib.py b/tailbone/views/shifts/lib.py index b8f5e9ee..7690bfec 100644 --- a/tailbone/views/shifts/lib.py +++ b/tailbone/views/shifts/lib.py @@ -197,6 +197,11 @@ class TimeSheetView(View): form.set_widget('store', forms.widgets.PlainSelectWidget(values=store_values)) if context['store']: form.set_default('store', context['store'].uuid) + else: + # TODO: why is this necessary? somehow the previous store is being + # preserved as the "default" when switching from single store view + # to "all stores" view + form.set_default('store', '') departments = self.get_departments() department_values = [(d.uuid, d.name) for d in departments] @@ -204,6 +209,11 @@ class TimeSheetView(View): form.set_widget('department', forms.widgets.PlainSelectWidget(values=department_values)) if context['department']: form.set_default('department', context['department'].uuid) + else: + # TODO: why is this necessary? somehow the previous dept is being + # preserved as the "default" when switching from single dept view + # to "all depts" view + form.set_default('department', '') form.set_type('date', 'date_jquery') form.set_default('date', get_sunday(context['date']))