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

Tweak product filter for report code name

Browse source 
i.e. make it more clear that it leverages the name
This commit is contained in:
Lance Edgar 2018-01-04 10:38:15 -06:00
parent 8d3846b2f2
commit 2cc0bb1995
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tailbone/views/products.py
View file

@ -169,7 +169,6 @@ class ProductsView(MasterView):
model.Department.uuid == model.Product.department_uuid) model.Department.uuid == model.Product.department_uuid)
g.joiners['subdepartment'] = lambda q: q.outerjoin(model.Subdepartment, g.joiners['subdepartment'] = lambda q: q.outerjoin(model.Subdepartment,
model.Subdepartment.uuid == model.Product.subdepartment_uuid) model.Subdepartment.uuid == model.Product.subdepartment_uuid)
g.joiners['report_code'] = lambda q: q.outerjoin(model.ReportCode)
g.joiners['code'] = lambda q: q.outerjoin(model.ProductCode) g.joiners['code'] = lambda q: q.outerjoin(model.ProductCode)
g.joiners['vendor'] = join_vendor g.joiners['vendor'] = join_vendor
g.joiners['vendor_any'] = join_vendor_any g.joiners['vendor_any'] = join_vendor_any
@ -193,7 +192,6 @@ class ProductsView(MasterView):
g.filters['department'] = g.make_filter('department', model.Department.name, g.filters['department'] = g.make_filter('department', model.Department.name,
default_active=True, default_verb='contains') default_active=True, default_verb='contains')
g.filters['subdepartment'] = g.make_filter('subdepartment', model.Subdepartment.name) g.filters['subdepartment'] = g.make_filter('subdepartment', model.Subdepartment.name)
g.filters['report_code'] = g.make_filter('report_code', model.ReportCode.name)
g.filters['code'] = g.make_filter('code', model.ProductCode.code) g.filters['code'] = g.make_filter('code', model.ProductCode.code)
g.filters['vendor'] = g.make_filter('vendor', model.Vendor.name) g.filters['vendor'] = g.make_filter('vendor', model.Vendor.name)
g.filters['vendor_any'] = g.make_filter('vendor_any', self.VendorAny.name) g.filters['vendor_any'] = g.make_filter('vendor_any', self.VendorAny.name)
@ -220,6 +218,10 @@ class ProductsView(MasterView):
g.set_sorter('current_price', self.CurrentPrice.price) g.set_sorter('current_price', self.CurrentPrice.price)
g.set_filter('current_price', self.CurrentPrice.price, label="Current Price") g.set_filter('current_price', self.CurrentPrice.price, label="Current Price")
# report_code_name
g.set_joiner('report_code_name', lambda q: q.outerjoin(model.ReportCode))
g.set_filter('report_code_name', model.ReportCode.name)
g.set_sort_defaults('upc') g.set_sort_defaults('upc')
if self.print_labels and self.request.has_perm('products.print_labels'): if self.print_labels and self.request.has_perm('products.print_labels'):