rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: fix default filter verbs logic for workorder status

Browse source
This commit is contained in:
Lance Edgar 2024-08-20 16:02:35 -05:00
parent 83586ef90f
commit 21f90f3f32
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tailbone/views/workorders.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2023 Lance Edgar # Copyright © 2010-2024 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -83,12 +83,12 @@ class WorkOrderView(MasterView):
] ]
def __init__(self, request): def __init__(self, request):
super(WorkOrderView, self).__init__(request) super().__init__(request)
app = self.get_rattail_app() app = self.get_rattail_app()
self.workorder_handler = app.get_workorder_handler() self.workorder_handler = app.get_workorder_handler()
def configure_grid(self, g): def configure_grid(self, g):
super(WorkOrderView, self).configure_grid(g) super().configure_grid(g)
model = self.model model = self.model
# customer # customer
@ -113,7 +113,7 @@ class WorkOrderView(MasterView):
return 'warning' return 'warning'
def configure_form(self, f): def configure_form(self, f):
super(WorkOrderView, self).configure_form(f) super().configure_form(f)
model = self.model model = self.model
SelectWidget = forms.widgets.JQuerySelectWidget SelectWidget = forms.widgets.JQuerySelectWidget
@ -208,7 +208,7 @@ class WorkOrderView(MasterView):
return event.workorder return event.workorder
def configure_row_grid(self, g): def configure_row_grid(self, g):
super(WorkOrderView, self).configure_row_grid(g) super().configure_row_grid(g)
g.set_enum('type_code', self.enum.WORKORDER_EVENT) g.set_enum('type_code', self.enum.WORKORDER_EVENT)
g.set_sort_defaults('occurred') g.set_sort_defaults('occurred')
@ -353,7 +353,7 @@ class WorkOrderView(MasterView):
class StatusFilter(grids.filters.AlchemyIntegerFilter): class StatusFilter(grids.filters.AlchemyIntegerFilter):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(StatusFilter, self).__init__(*args, **kwargs) super().__init__(*args, **kwargs)
from drild import enum from drild import enum
@ -369,14 +369,14 @@ class StatusFilter(grids.filters.AlchemyIntegerFilter):
@property @property
def verb_labels(self): def verb_labels(self):
labels = dict(super(StatusFilter, self).verb_labels) labels = dict(super().verb_labels)
labels['is_active'] = "Is Active" labels['is_active'] = "Is Active"
labels['not_active'] = "Is Not Active" labels['not_active'] = "Is Not Active"
return labels return labels
@property @property
def valueless_verbs(self): def valueless_verbs(self):
verbs = list(super(StatusFilter, self).valueless_verbs) verbs = list(super().valueless_verbs)
verbs.extend([ verbs.extend([
'is_active', 'is_active',
'not_active', 'not_active',
@ -385,7 +385,11 @@ class StatusFilter(grids.filters.AlchemyIntegerFilter):
@property @property
def default_verbs(self): def default_verbs(self):
verbs = list(super(StatusFilter, self).default_verbs) verbs = super().default_verbs
if callable(verbs):
verbs = verbs()
verbs = list(verbs or [])
verbs.insert(0, 'is_active') verbs.insert(0, 'is_active')
verbs.insert(1, 'not_active') verbs.insert(1, 'not_active')
return verbs return verbs