From da910b1414fd1eb887312bd9ae9423a3a3902546 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 11 Mar 2022 20:55:01 -0600 Subject: [PATCH] Add default help link for Receiving feature also stop showing "buyer" filter by default --- tailbone/views/master.py | 4 ++++ tailbone/views/purchasing/batch.py | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tailbone/views/master.py b/tailbone/views/master.py index 873439c4..e6e96a67 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -155,6 +155,7 @@ class MasterView(View): use_index_links = False has_versions = False + default_help_url = None help_url = None labels = {'uuid': "UUID"} @@ -2167,6 +2168,9 @@ class MasterView(View): if self.help_url: return self.help_url + if self.default_help_url: + return self.default_help_url + return global_help_url(self.rattail_config) def render_to_response(self, template, data, **kwargs): diff --git a/tailbone/views/purchasing/batch.py b/tailbone/views/purchasing/batch.py index 8a015838..93d7ff21 100644 --- a/tailbone/views/purchasing/batch.py +++ b/tailbone/views/purchasing/batch.py @@ -49,6 +49,7 @@ class PurchasingBatchView(BatchMasterView): default_handler_spec = 'rattail.batch.purchase:PurchaseBatchHandler' supports_new_product = False cloneable = True + default_help_url = 'https://rattailproject.org/docs/rattail-manual/features/purchasing/receiving/index.html' labels = { 'po_total': "PO Total", @@ -179,10 +180,9 @@ class PurchasingBatchView(BatchMasterView): g.filters['department'] = g.make_filter('department', model.Department.name) g.sorters['department'] = g.make_sorter(model.Department.name) - g.joiners['buyer'] = lambda q: q.join(model.Employee).join(model.Person) - g.filters['buyer'] = g.make_filter('buyer', model.Person.display_name, - default_active=True, default_verb='contains') - g.sorters['buyer'] = g.make_sorter(model.Person.display_name) + g.set_joiner('buyer', lambda q: q.join(model.Employee).join(model.Person)) + g.set_filter('buyer', model.Person.display_name) + g.set_sorter('buyer', model.Person.display_name) # TODO: we used to include the 'complete' filter by default, but it # seems to likely be confusing for newcomers, so it is no longer