From 35131c87326edc09d84772d04caeb12d90a52dd1 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 30 Nov 2023 18:23:47 -0600 Subject: [PATCH 001/357] Provide a way to show enum display text for some version diff fields master view must explicitly declare which enums for which fields --- docs/api/diffs.rst | 6 +++ docs/api/views/master.rst | 14 ++++++ docs/api/views/members.rst | 6 +++ docs/index.rst | 2 + tailbone/diffs.py | 94 ++++++++++++++++++++++++++++---------- tailbone/views/master.py | 49 +++++++++++++++++++- tailbone/views/members.py | 27 ++++++++++- 7 files changed, 172 insertions(+), 26 deletions(-) create mode 100644 docs/api/diffs.rst create mode 100644 docs/api/views/members.rst diff --git a/docs/api/diffs.rst b/docs/api/diffs.rst new file mode 100644 index 00000000..fb1bba71 --- /dev/null +++ b/docs/api/diffs.rst @@ -0,0 +1,6 @@ + +``tailbone.diffs`` +================== + +.. automodule:: tailbone.diffs + :members: diff --git a/docs/api/views/master.rst b/docs/api/views/master.rst index 44278e0a..e7de7170 100644 --- a/docs/api/views/master.rst +++ b/docs/api/views/master.rst @@ -81,6 +81,12 @@ override when defining your subclass. override this for certain views, if so that should be done within :meth:`get_help_url()`. + .. attribute:: MasterView.version_diff_factory + + Optional factory to use for version diff objects. By default + this is *not set* but a subclass is free to set it. See also + :meth:`get_version_diff_factory()`. + Methods to Override ------------------- @@ -100,6 +106,14 @@ subclass. .. automethod:: MasterView.get_model_key + .. automethod:: MasterView.get_version_diff_enums + + .. automethod:: MasterView.get_version_diff_factory + + .. automethod:: MasterView.make_version_diff + + .. automethod:: MasterView.title_for_version + Support Methods --------------- diff --git a/docs/api/views/members.rst b/docs/api/views/members.rst new file mode 100644 index 00000000..6a9e9168 --- /dev/null +++ b/docs/api/views/members.rst @@ -0,0 +1,6 @@ + +``tailbone.views.members`` +========================== + +.. automodule:: tailbone.views.members + :members: diff --git a/docs/index.rst b/docs/index.rst index b19d859f..4aa22f3e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -44,6 +44,7 @@ Package API: api/api/batch/core api/api/batch/ordering + api/diffs api/forms api/grids api/grids.core @@ -53,6 +54,7 @@ Package API: api/views/batch.vendorcatalog api/views/core api/views/master + api/views/members api/views/purchasing.batch api/views/purchasing.ordering diff --git a/tailbone/diffs.py b/tailbone/diffs.py index cdf35830..98253c57 100644 --- a/tailbone/diffs.py +++ b/tailbone/diffs.py @@ -34,35 +34,38 @@ from webhelpers2.html import HTML class Diff(object): """ Core diff class. In sore need of documentation. + + You must provide the old and new data sets, and the set of + relevant fields as well, if they cannot be easily introspected. + + :param old_data: Dict of "old" data values. + + :param new_data: Dict of "old" data values. + + :param fields: Sequence of relevant field names. Note that + both data dicts are expected to have keys which match these + field names. If you do not specify the fields then they + will (hopefully) be introspected from the old or new data + sets; however this will not work if they are both empty. + + :param monospace: If true, this flag will cause the value + columns to be rendered in monospace font. This is assumed + to be helpful when comparing "raw" data values which are + shown as e.g. ``repr(val)``. + + :param enums: Optional dict of enums for use when displaying field + values. If specified, keys should be field names and values + should be enum dicts. """ - def __init__(self, old_data, new_data, columns=None, fields=None, + def __init__(self, old_data, new_data, columns=None, fields=None, enums=None, render_field=None, render_value=None, nature='dirty', monospace=False, extra_row_attrs=None): - """ - Constructor. You must provide the old and new data sets, and - the set of relevant fields as well, if they cannot be easily - introspected. - - :param old_data: Dict of "old" data values. - - :param new_data: Dict of "old" data values. - - :param fields: Sequence of relevant field names. Note that - both data dicts are expected to have keys which match these - field names. If you do not specify the fields then they - will (hopefully) be introspected from the old or new data - sets; however this will not work if they are both empty. - - :param monospace: If true, this flag will cause the value - columns to be rendered in monospace font. This is assumed - to be helpful when comparing "raw" data values which are - shown as e.g. ``repr(val)``. - """ self.old_data = old_data self.new_data = new_data self.columns = columns or ["field name", "old value", "new value"] self.fields = fields or self.make_fields() + self.enums = enums or {} self._render_field = render_field or self.render_field_default self.render_value = render_value or self.render_value_default self.nature = nature @@ -92,7 +95,7 @@ class Diff(object): for the given field. May be an empty string, or a snippet of HTML attribute syntax, e.g.: - .. code-highlight:: none + .. code-block:: none class="diff" foo="bar" @@ -132,7 +135,21 @@ class Diff(object): class VersionDiff(Diff): """ - Special diff class, for use with version history views + Special diff class, for use with version history views. Note that + while based on :class:`Diff`, this class uses a different + signature for the constructor. + + :param version: Reference to a Continuum version record (object). + + :param \*args: Typical usage will not require positional args + beyond the ``version`` param, in which case ``old_data`` and + ``new_data`` params will be auto-determined based on the + ``version``. But if you specify positional args then nothing + automatic is done, they are passed as-is to the parent + :class:`Diff` constructor. + + :param \*\*kwargs: Remaining kwargs are passed as-is to the + :class:`Diff` constructor. """ def __init__(self, version, *args, **kwargs): @@ -176,9 +193,40 @@ class VersionDiff(Diff): if field not in unwanted] def render_version_value(self, field, value, version): + """ + Render the cell value text for the given version/field info. + + Note that this method is used to render both sides of the diff + (before and after values). + + :param field: Name of the field, as string. + + :param value: Raw value for the field, as obtained from ``version``. + + :param version: Reference to the Continuum version object. + + :returns: Rendered text as string, or ``None``. + """ text = HTML.tag('span', c=[repr(value)], style='font-family: monospace;') + # assume the enum display is all we need, if enum exists for the field + if field in self.enums: + + # but skip the enum display if None + display = self.enums[field].get(value) + if display is None and value is None: + return text + + # otherwise show enum display to the right of raw value + display = self.enums[field].get(value, str(value)) + return HTML.tag('span', c=[ + text, + HTML.tag('span', c=[display], + style='margin-left: 2rem; font-style: italic; font-weight: bold;'), + ]) + + # next we look for a relationship and may render the foreign object for prop in self.mapper.relationships: if prop.uselist: continue diff --git a/tailbone/views/master.py b/tailbone/views/master.py index cf001c36..cc2adcaf 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -597,7 +597,6 @@ class MasterView(View): return defaults def configure_row_grid(self, grid): - # super(MasterView, self).configure_row_grid(grid) self.set_row_labels(grid) self.configure_column_customer_key(grid) @@ -1528,6 +1527,15 @@ class MasterView(View): }) def title_for_version(self, version): + """ + Must return the title text for the given version. By default + this will be the :term:`rattail:model title` for the version's + data class. + + :param version: Reference to a Continuum version object. + + :returns: Title text for the version, as string. + """ cls = continuum.parent_class(version.__class__) return cls.get_model_title() @@ -4962,13 +4970,52 @@ class MasterView(View): return diffs.Diff(old_data, new_data, **kwargs) def get_version_diff_factory(self, **kwargs): + """ + Must return the factory to be used when creating version diff + objects. + + By default this returns the + :class:`tailbone.diffs.VersionDiff` class, unless + :attr:`version_diff_factory` is set, in which case that is + returned as-is. + + :returns: A factory which can produce + :class:`~tailbone.diffs.VersionDiff` objects. + """ if hasattr(self, 'version_diff_factory'): return self.version_diff_factory return diffs.VersionDiff + def get_version_diff_enums(self, version): + """ + This can optionally return a dict of field enums, to be passed + to the version diff factory. This method is called as part of + :meth:`make_version_diff()`. + """ + def make_version_diff(self, version, *args, **kwargs): + """ + Make a version diff object, using the factory returned by + :meth:`get_version_diff_factory()`. + + :param version: Reference to a Continuum version object. + + :param title: If specified, must be as a kwarg. Optional + override for the version title text. If not specified, + :meth:`title_for_version()` is called for the title. + + :param \*args: Additional args to pass to the factory. + + :param \*\*kwargs: Additional kwargs to pass to the factory. + + :returns: A :class:`~tailbone.diffs.VersionDiff` object. + """ if 'title' not in kwargs: kwargs['title'] = self.title_for_version(version) + + if 'enums' not in kwargs: + kwargs['enums'] = self.get_version_diff_enums(version) + factory = self.get_version_diff_factory() return factory(version, *args, **kwargs) diff --git a/tailbone/views/members.py b/tailbone/views/members.py index b1bb2a0d..de844eb7 100644 --- a/tailbone/views/members.py +++ b/tailbone/views/members.py @@ -27,6 +27,7 @@ Member Views from collections import OrderedDict import sqlalchemy as sa +import sqlalchemy_continuum as continuum from rattail.db import model from rattail.db.model import MembershipType, Member, MemberEquityPayment @@ -71,6 +72,7 @@ class MembershipTypeView(MasterView): ] def configure_grid(self, g): + """ """ super().configure_grid(g) g.set_sort_defaults('number') @@ -79,6 +81,7 @@ class MembershipTypeView(MasterView): g.set_link('name') def get_row_data(self, memtype): + """ """ model = self.model return self.Session.query(model.Member)\ .filter(model.Member.membership_type == memtype) @@ -102,7 +105,7 @@ class MemberView(MasterView): """ Master view for the Member class. """ - model_class = model.Member + model_class = Member is_contact = True touchable = True has_versions = True @@ -169,6 +172,7 @@ class MemberView(MasterView): return app.get_people_handler().get_quickie_search_placeholder() def configure_grid(self, g): + """ """ super().configure_grid(g) route_prefix = self.get_route_prefix() model = self.model @@ -263,13 +267,16 @@ class MemberView(MasterView): default=False) def grid_extra_class(self, member, i): + """ """ if not member.active: return 'warning' if member.equity_current is False: return 'notice' def configure_form(self, f): + """ """ super().configure_form(f) + model = self.model member = f.model_instance # date fields @@ -342,6 +349,7 @@ class MemberView(MasterView): return app.render_currency(total) def template_kwargs_view(self, **kwargs): + """ """ kwargs = super().template_kwargs_view(**kwargs) app = self.get_rattail_app() member = kwargs['instance'] @@ -360,10 +368,12 @@ class MemberView(MasterView): return kwargs def render_default_email(self, member, field): + """ """ if member.emails: return member.emails[0].address def render_default_phone(self, member, field): + """ """ if member.phones: return member.phones[0].number @@ -376,6 +386,7 @@ class MemberView(MasterView): return tags.link_to(text, url) def get_row_data(self, member): + """ """ model = self.model return self.Session.query(model.MemberEquityPayment)\ .filter(model.MemberEquityPayment.member == member) @@ -395,6 +406,7 @@ class MemberView(MasterView): uuid=payment.uuid) def configure_get_simple_settings(self): + """ """ return [ # General @@ -417,7 +429,7 @@ class MemberEquityPaymentView(MasterView): """ Master view for the MemberEquityPayment class. """ - model_class = model.MemberEquityPayment + model_class = MemberEquityPayment route_prefix = 'member_equity_payments' url_prefix = '/member-equity-payments' supports_grid_totals = True @@ -450,6 +462,7 @@ class MemberEquityPaymentView(MasterView): ] def query(self, session): + """ """ query = super().query(session) model = self.model @@ -458,6 +471,7 @@ class MemberEquityPaymentView(MasterView): return query def configure_grid(self, g): + """ """ super().configure_grid(g) model = self.model @@ -502,6 +516,7 @@ class MemberEquityPaymentView(MasterView): return {'totals_display': app.render_currency(total)} def configure_form(self, f): + """ """ super().configure_form(f) model = self.model payment = f.model_instance @@ -543,6 +558,14 @@ class MemberEquityPaymentView(MasterView): # status_code f.set_enum('status_code', model.MemberEquityPayment.STATUS) + def get_version_diff_enums(self, version): + """ """ + model = self.model + cls = continuum.parent_class(version.__class__) + + if cls is model.MemberEquityPayment: + return {'status_code': model.MemberEquityPayment.STATUS} + def defaults(config, **kwargs): base = globals() From faeb2cb7e29a9b70b5a2b28009a3aa75d14a7d01 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 30 Nov 2023 18:25:01 -0600 Subject: [PATCH 002/357] Update changelog --- CHANGES.rst | 6 ++++++ tailbone/_version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index cd356554..45e5cc1b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ CHANGELOG ========= +0.9.84 (2023-11-30) +------------------- + +* Provide a way to show enum display text for some version diff fields. + + 0.9.83 (2023-11-30) ------------------- diff --git a/tailbone/_version.py b/tailbone/_version.py index 31167701..a44d3ed3 100644 --- a/tailbone/_version.py +++ b/tailbone/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.9.83' +__version__ = '0.9.84' From 3e4bbf7092fa0937d32ba5e8659a99a0a6d45242 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 1 Dec 2023 19:50:07 -0600 Subject: [PATCH 003/357] Use clientele handler to populate customer dropdown widget --- docs/api/forms.widgets.rst | 6 +++++ docs/index.rst | 1 + tailbone/forms/widgets.py | 52 +++++++++++++++++++++++++------------- 3 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 docs/api/forms.widgets.rst diff --git a/docs/api/forms.widgets.rst b/docs/api/forms.widgets.rst new file mode 100644 index 00000000..33316903 --- /dev/null +++ b/docs/api/forms.widgets.rst @@ -0,0 +1,6 @@ + +``tailbone.forms.widgets`` +========================== + +.. automodule:: tailbone.forms.widgets + :members: diff --git a/docs/index.rst b/docs/index.rst index 4aa22f3e..351e910d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -46,6 +46,7 @@ Package API: api/api/batch/ordering api/diffs api/forms + api/forms.widgets api/grids api/grids.core api/progress diff --git a/tailbone/forms/widgets.py b/tailbone/forms/widgets.py index 0b8d3dc9..db57f4f0 100644 --- a/tailbone/forms/widgets.py +++ b/tailbone/forms/widgets.py @@ -40,6 +40,7 @@ class ReadonlyWidget(dfwidget.HiddenWidget): readonly = True def serialize(self, field, cstruct, **kw): + """ """ if cstruct in (colander.null, None): cstruct = '' # TODO: is this hacky? @@ -77,15 +78,17 @@ class PercentInputWidget(dfwidget.TextInputWidget): autocomplete = 'off' def serialize(self, field, cstruct, **kw): + """ """ if cstruct not in (colander.null, None): # convert "traditional" value to "human-friendly" value = decimal.Decimal(cstruct) * 100 value = value.quantize(decimal.Decimal('0.001')) cstruct = str(value) - return super(PercentInputWidget, self).serialize(field, cstruct, **kw) + return super().serialize(field, cstruct, **kw) def deserialize(self, field, pstruct): - pstruct = super(PercentInputWidget, self).deserialize(field, pstruct) + """ """ + pstruct = super().deserialize(field, pstruct) if pstruct is colander.null: return colander.null # convert "human-friendly" value to "traditional" @@ -108,6 +111,7 @@ class CasesUnitsWidget(dfwidget.Widget): one_amount_only = False def serialize(self, field, cstruct, **kw): + """ """ if cstruct in (colander.null, None): cstruct = '' readonly = kw.get('readonly', self.readonly) @@ -118,6 +122,7 @@ class CasesUnitsWidget(dfwidget.Widget): return field.renderer(template, **values) def deserialize(self, field, pstruct): + """ """ from tailbone.forms.types import ProductQuantity if pstruct is colander.null: @@ -166,7 +171,7 @@ class CustomSelectWidget(dfwidget.SelectWidget): self.extra_template_values.update(kw) def get_template_values(self, field, cstruct, kw): - values = super(CustomSelectWidget, self).get_template_values(field, cstruct, kw) + values = super().get_template_values(field, cstruct, kw) if hasattr(self, 'extra_template_values'): values.update(self.extra_template_values) return values @@ -209,6 +214,7 @@ class JQueryDateWidget(dfwidget.DateInputWidget): ) def serialize(self, field, cstruct, **kw): + """ """ if cstruct in (colander.null, None): cstruct = '' readonly = kw.get('readonly', self.readonly) @@ -243,12 +249,14 @@ class FalafelDateTimeWidget(dfwidget.DateTimeInputWidget): template = 'datetime_falafel' def serialize(self, field, cstruct, **kw): + """ """ readonly = kw.get('readonly', self.readonly) values = self.get_template_values(field, cstruct, kw) template = self.readonly_template if readonly else self.template return field.renderer(template, **values) def deserialize(self, field, pstruct): + """ """ if pstruct == '': return colander.null return pstruct @@ -261,6 +269,7 @@ class FalafelTimeWidget(dfwidget.TimeInputWidget): template = 'time_falafel' def deserialize(self, field, pstruct): + """ """ if pstruct == '': return colander.null return pstruct @@ -288,6 +297,7 @@ class JQueryAutocompleteWidget(dfwidget.AutocompleteInputWidget): options = None def serialize(self, field, cstruct, **kw): + """ """ if 'delay' in kw or getattr(self, 'delay', None): raise ValueError( 'AutocompleteWidget does not support *delay* parameter ' @@ -324,6 +334,7 @@ class MultiFileUploadWidget(dfwidget.FileUploadWidget): requirements = () def serialize(self, field, cstruct, **kw): + """ """ if cstruct in (colander.null, None): cstruct = [] @@ -339,6 +350,7 @@ class MultiFileUploadWidget(dfwidget.FileUploadWidget): return field.renderer(template, **values) def deserialize(self, field, pstruct): + """ """ if pstruct is colander.null: return colander.null @@ -359,6 +371,7 @@ class MultiFileUploadWidget(dfwidget.FileUploadWidget): return files_data def deserialize_upload(self, upload): + """ """ # nb. this logic was copied from parent class and adapted # to allow for multiple files. needs some more love. @@ -428,11 +441,13 @@ def make_customer_widget(request, **kwargs): class CustomerAutocompleteWidget(JQueryAutocompleteWidget): """ - Autocomplete widget for a Customer reference field. + Autocomplete widget for a + :class:`~rattail:rattail.db.model.customers.Customer` reference + field. """ def __init__(self, request, *args, **kwargs): - super(CustomerAutocompleteWidget, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.request = request model = self.request.rattail_config.get_model() @@ -452,7 +467,7 @@ class CustomerAutocompleteWidget(JQueryAutocompleteWidget): self.input_callback = input_handler def serialize(self, field, cstruct, **kw): - + """ """ # fetch customer to provide button label, if we have a value if cstruct: model = self.request.rattail_config.get_model() @@ -460,18 +475,21 @@ class CustomerAutocompleteWidget(JQueryAutocompleteWidget): if customer: self.field_display = str(customer) - return super(CustomerAutocompleteWidget, self).serialize( + return super().serialize( field, cstruct, **kw) class CustomerDropdownWidget(dfwidget.SelectWidget): """ - Dropdown widget for a Customer reference field. + Dropdown widget for a + :class:`~rattail:rattail.db.model.customers.Customer` reference + field. """ def __init__(self, request, *args, **kwargs): - super(CustomerDropdownWidget, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.request = request + app = self.request.rattail_config.get_app() # must figure out dropdown values, if they weren't given if 'values' not in kwargs: @@ -483,10 +501,8 @@ class CustomerDropdownWidget(dfwidget.SelectWidget): customers = customers() else: # default customer list - model = self.request.rattail_config.get_model() - customers = Session.query(model.Customer)\ - .order_by(model.Customer.name)\ - .all() + customers = app.get_clientele_handler()\ + .get_all_customers(Session()) # convert customer list to option values self.values = [(c.uuid, c.name) @@ -517,7 +533,7 @@ class DepartmentWidget(dfwidget.SelectWidget): values.insert(0, ('', "(none)")) kwargs['values'] = values - super(DepartmentWidget, self).__init__(**kwargs) + super().__init__(**kwargs) def make_vendor_widget(request, **kwargs): @@ -548,7 +564,7 @@ class VendorAutocompleteWidget(JQueryAutocompleteWidget): """ def __init__(self, request, *args, **kwargs): - super(VendorAutocompleteWidget, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.request = request model = self.request.rattail_config.get_model() @@ -568,7 +584,7 @@ class VendorAutocompleteWidget(JQueryAutocompleteWidget): # self.input_callback = input_handler def serialize(self, field, cstruct, **kw): - + """ """ # fetch vendor to provide button label, if we have a value if cstruct: model = self.request.rattail_config.get_model() @@ -576,7 +592,7 @@ class VendorAutocompleteWidget(JQueryAutocompleteWidget): if vendor: self.field_display = str(vendor) - return super(VendorAutocompleteWidget, self).serialize( + return super().serialize( field, cstruct, **kw) @@ -586,7 +602,7 @@ class VendorDropdownWidget(dfwidget.SelectWidget): """ def __init__(self, request, *args, **kwargs): - super(VendorDropdownWidget, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.request = request # must figure out dropdown values, if they weren't given From d154986128a353e03bec4a0d18c55128bee43020 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 1 Dec 2023 21:57:20 -0600 Subject: [PATCH 004/357] Update changelog --- CHANGES.rst | 6 ++++++ tailbone/_version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 45e5cc1b..7cffe70a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ CHANGELOG ========= +0.9.85 (2023-12-01) +------------------- + +* Use clientele handler to populate customer dropdown widget. + + 0.9.84 (2023-11-30) ------------------- diff --git a/tailbone/_version.py b/tailbone/_version.py index a44d3ed3..66aab6b4 100644 --- a/tailbone/_version.py +++ b/tailbone/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.9.84' +__version__ = '0.9.85' From 91e7001963148766997a7d349e7d9c40cfca90ce Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 4 Dec 2023 10:15:12 -0600 Subject: [PATCH 005/357] Overhaul tox config for more python versions --- setup.cfg | 6 ++++++ tox.ini | 31 +++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/setup.cfg b/setup.cfg index 85501357..67541d96 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,6 +26,12 @@ classifiers = Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 3 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Topic :: Internet :: WWW/HTTP Topic :: Office/Business Topic :: Software Development :: Libraries :: Python Modules diff --git a/tox.ini b/tox.ini index 8681465d..ea833b39 100644 --- a/tox.ini +++ b/tox.ini @@ -1,25 +1,28 @@ [tox] -envlist = py36, py37, py39 +envlist = py36, py37, py38, py39, py310, py311 + +# TODO: can remove this when we drop py36 support +# nb. need this for testing older python versions +# https://tox.wiki/en/latest/faq.html#testing-end-of-life-python-versions +requires = virtualenv<20.22.0 [testenv] -commands = - pip install --upgrade pip - pip install --upgrade setuptools wheel - pip install --upgrade --upgrade-strategy eager Tailbone[tests] rattail[bouncer,db] rattail-tempmon - pytest {posargs} +deps = rattail-tempmon +extras = tests +commands = pytest {posargs} + +[testenv:py37] +# nb. Chameleon 4.3 requires Python 3.9+ +deps = Chameleon<4.3 [testenv:coverage] basepython = python3 -commands = - pip install --upgrade pip - pip install --upgrade --upgrade-strategy eager Tailbone[tests] rattail[bouncer,db] rattail-tempmon - pytest --cov=tailbone --cov-report=html +extras = tests +commands = pytest --cov=tailbone --cov-report=html [testenv:docs] basepython = python3 changedir = docs -commands = - pip install --upgrade pip - pip install --upgrade --upgrade-strategy eager Tailbone[docs] rattail[bouncer,db] rattail-tempmon - sphinx-build -b html -d {envtmpdir}/doctrees -W -T . {envtmpdir}/docs +extras = docs +commands = sphinx-build -b html -d {envtmpdir}/doctrees -W -T . {envtmpdir}/docs From 98fc82acfd0fdad8e0c6f30bc90993f85007931a Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 11 Dec 2023 13:50:02 -0600 Subject: [PATCH 006/357] Use `ltrim(rtrim())` instead of just `trim()` in grid filters apparently this is needed for older SQL Server compatibility, per https://stackoverflow.com/questions/54340470/trim-is-not-a-recognized-built-in-function-name --- tailbone/grids/filters.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/tailbone/grids/filters.py b/tailbone/grids/filters.py index 2585433e..f70670b6 100644 --- a/tailbone/grids/filters.py +++ b/tailbone/grids/filters.py @@ -313,7 +313,7 @@ class AlchemyGridFilter(GridFilter): def __init__(self, *args, **kwargs): self.column = kwargs.pop('column') - super(AlchemyGridFilter, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def filter_equal(self, query, value): """ @@ -538,17 +538,18 @@ class AlchemyStringFilter(AlchemyGridFilter): return query.filter(sa.or_(*conditions)) def filter_is_empty(self, query, value): - return query.filter(sa.func.trim(self.column) == self.encode_value('')) + return query.filter(sa.func.ltrim(sa.func.rtrim(self.column)) == self.encode_value('')) def filter_is_not_empty(self, query, value): - return query.filter(sa.func.trim(self.column) != self.encode_value('')) + return query.filter(sa.func.ltrim(sa.func.rtrim(self.column)) != self.encode_value('')) def filter_is_empty_or_null(self, query, value): return query.filter( sa.or_( - sa.func.trim(self.column) == self.encode_value(''), + sa.func.ltrim(sa.func.rtrim(self.column)) == self.encode_value(''), self.column == None)) + class AlchemyEmptyStringFilter(AlchemyStringFilter): """ String filter with special logic to treat empty string values as NULL @@ -558,13 +559,13 @@ class AlchemyEmptyStringFilter(AlchemyStringFilter): return query.filter( sa.or_( self.column == None, - sa.func.trim(self.column) == self.encode_value(''))) + sa.func.ltrim(sa.func.rtrim(self.column)) == self.encode_value(''))) def filter_is_not_null(self, query, value): return query.filter( sa.and_( self.column != None, - sa.func.trim(self.column) != self.encode_value(''))) + sa.func.ltrim(sa.func.rtrim(self.column)) != self.encode_value(''))) class AlchemyByteStringFilter(AlchemyStringFilter): @@ -576,7 +577,7 @@ class AlchemyByteStringFilter(AlchemyStringFilter): value_encoding = 'utf-8' def get_value(self, value=UNSPECIFIED): - value = super(AlchemyByteStringFilter, self).get_value(value) + value = super().get_value(value) if isinstance(value, str): value = value.encode(self.value_encoding) return value @@ -637,32 +638,32 @@ class AlchemyNumericFilter(AlchemyGridFilter): def filter_equal(self, query, value): if self.value_invalid(value): return query - return super(AlchemyNumericFilter, self).filter_equal(query, value) + return super().filter_equal(query, value) def filter_not_equal(self, query, value): if self.value_invalid(value): return query - return super(AlchemyNumericFilter, self).filter_not_equal(query, value) + return super().filter_not_equal(query, value) def filter_greater_than(self, query, value): if self.value_invalid(value): return query - return super(AlchemyNumericFilter, self).filter_greater_than(query, value) + return super().filter_greater_than(query, value) def filter_greater_equal(self, query, value): if self.value_invalid(value): return query - return super(AlchemyNumericFilter, self).filter_greater_equal(query, value) + return super().filter_greater_equal(query, value) def filter_less_than(self, query, value): if self.value_invalid(value): return query - return super(AlchemyNumericFilter, self).filter_less_than(query, value) + return super().filter_less_than(query, value) def filter_less_equal(self, query, value): if self.value_invalid(value): return query - return super(AlchemyNumericFilter, self).filter_less_equal(query, value) + return super().filter_less_equal(query, value) class AlchemyIntegerFilter(AlchemyNumericFilter): @@ -1193,7 +1194,7 @@ class AlchemyPhoneNumberFilter(AlchemyStringFilter): 'ILIKE' query with those parts. """ value = self.parse_value(value) - return super(AlchemyPhoneNumberFilter, self).filter_contains(query, value) + return super().filter_contains(query, value) def filter_does_not_contain(self, query, value): """ @@ -1201,7 +1202,7 @@ class AlchemyPhoneNumberFilter(AlchemyStringFilter): 'NOT ILIKE' query with those parts. """ value = self.parse_value(value) - return super(AlchemyPhoneNumberFilter, self).filter_does_not_contain(query, value) + return super().filter_does_not_contain(query, value) class GridFilterSet(OrderedDict): @@ -1245,7 +1246,7 @@ class GridFiltersForm(forms.Form): node = colander.SchemaNode(colander.String(), name=key) schema.add(node) kwargs['schema'] = schema - super(GridFiltersForm, self).__init__(**kwargs) + super().__init__(**kwargs) def iter_filters(self): return self.filters.values() From b6618c8ee5e48ada18e429b4ae85a674e91e18cb Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 12 Dec 2023 11:46:28 -0600 Subject: [PATCH 007/357] Update changelog --- CHANGES.rst | 6 ++++++ tailbone/_version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7cffe70a..40e3a0d1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ CHANGELOG ========= +0.9.86 (2023-12-12) +------------------- + +* Use ``ltrim(rtrim())`` instead of just ``trim()`` in grid filters. + + 0.9.85 (2023-12-01) ------------------- diff --git a/tailbone/_version.py b/tailbone/_version.py index 66aab6b4..689b5c2b 100644 --- a/tailbone/_version.py +++ b/tailbone/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.9.85' +__version__ = '0.9.86' From 90630fe8523a9de739de4ec73076b69a24914d4b Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 13 Dec 2023 12:05:42 -0600 Subject: [PATCH 008/357] Auto-disable submit button for login form not sure why i had explicitly disabled that before..? --- tailbone/views/auth.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tailbone/views/auth.py b/tailbone/views/auth.py index f8d71d34..7c4d26f0 100644 --- a/tailbone/views/auth.py +++ b/tailbone/views/auth.py @@ -101,8 +101,6 @@ class AuthenticationView(View): form = forms.Form(schema=UserLogin(), request=self.request) form.save_label = "Login" - form.auto_disable_save = False - form.auto_disable = False # TODO: deprecate / remove this form.show_reset = True form.show_cancel = False if form.validate(): From 90e35ee3dbcb35335437ae530c8a731305fec366 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 19 Dec 2023 12:49:33 -0600 Subject: [PATCH 009/357] Hide single invoice file field for multi-invoice receiving batch --- tailbone/views/purchasing/receiving.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tailbone/views/purchasing/receiving.py b/tailbone/views/purchasing/receiving.py index 33f3cc53..8cf38aaf 100644 --- a/tailbone/views/purchasing/receiving.py +++ b/tailbone/views/purchasing/receiving.py @@ -533,6 +533,7 @@ class ReceivingBatchView(PurchasingBatchView): f.insert_before('invoice_file', 'invoice_files') f.set_renderer('invoice_files', self.render_invoice_files) f.set_readonly('invoice_files', True) + f.remove('invoice_file') # invoice totals f.set_label('invoice_total', "Invoice Total (Orig.)") From 3bdc7175a3fb52bf3c28f1d88c81cd647ee634b2 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 20 Dec 2023 11:56:24 -0600 Subject: [PATCH 010/357] Use common logic to render invoice total for receiving and avoid error if total is none --- tailbone/views/purchasing/receiving.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tailbone/views/purchasing/receiving.py b/tailbone/views/purchasing/receiving.py index 8cf38aaf..22fbc133 100644 --- a/tailbone/views/purchasing/receiving.py +++ b/tailbone/views/purchasing/receiving.py @@ -1857,6 +1857,7 @@ class ReceivingBatchView(PurchasingBatchView): """ AJAX view for updating various cost fields in a data row. """ + app = self.get_rattail_app() model = self.model batch = self.get_instance() data = dict(get_form_data(self.request)) @@ -1891,10 +1892,10 @@ class ReceivingBatchView(PurchasingBatchView): 'catalog_cost_confirmed': row.catalog_cost_confirmed, 'invoice_unit_cost': self.render_simple_unit_cost(row, 'invoice_unit_cost'), 'invoice_cost_confirmed': row.invoice_cost_confirmed, - 'invoice_total_calculated': '{:0.2f}'.format(row.invoice_total_calculated), + 'invoice_total_calculated': app.render_currency(row.invoice_total_calculated), }, 'batch': { - 'invoice_total_calculated': '{:0.2f}'.format(batch.invoice_total_calculated), + 'invoice_total_calculated': app.render_currency(batch.invoice_total_calculated), }, } From a40add8f413d44e3d34ca67204af441269dbda8f Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 22 Dec 2023 11:50:05 -0600 Subject: [PATCH 011/357] Expose default custorder discount for Departments --- tailbone/views/departments.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tailbone/views/departments.py b/tailbone/views/departments.py index 3d462b16..a062b183 100644 --- a/tailbone/views/departments.py +++ b/tailbone/views/departments.py @@ -59,6 +59,7 @@ class DepartmentView(MasterView): 'tax', 'food_stampable', 'exempt_from_gross_sales', + 'default_custorder_discount', 'allow_product_deletions', 'employees', ] @@ -114,6 +115,9 @@ class DepartmentView(MasterView): # TODO: make this editable f.set_readonly('tax') + # default_custorder_discount + f.set_type('default_custorder_discount', 'percent') + def render_employees(self, department, field): route_prefix = self.get_route_prefix() permission_prefix = self.get_permission_prefix() From 25c48a97c55a0e8ea5909fe2b34dc0fb8407d1e4 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 26 Dec 2023 20:17:05 -0600 Subject: [PATCH 012/357] Update changelog --- CHANGES.rst | 12 ++++++++++++ tailbone/_version.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 40e3a0d1..174c06ae 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,18 @@ CHANGELOG ========= +0.9.87 (2023-12-26) +------------------- + +* Auto-disable submit button for login form. + +* Hide single invoice file field for multi-invoice receiving batch. + +* Use common logic to render invoice total for receiving. + +* Expose default custorder discount for Departments. + + 0.9.86 (2023-12-12) ------------------- diff --git a/tailbone/_version.py b/tailbone/_version.py index 689b5c2b..5c813a10 100644 --- a/tailbone/_version.py +++ b/tailbone/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.9.86' +__version__ = '0.9.87' From 0b7d2f5aede8f5f6123326f87b78b04247632b70 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 26 Mar 2024 11:47:37 -0500 Subject: [PATCH 013/357] Fix how metadata/bind is used for importer batch table per changes coming in SQLAlchemy 2.0 --- tailbone/views/batch/importer.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tailbone/views/batch/importer.py b/tailbone/views/batch/importer.py index f0b76bf6..a5916448 100644 --- a/tailbone/views/batch/importer.py +++ b/tailbone/views/batch/importer.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -26,7 +26,7 @@ Views for importer batches import sqlalchemy as sa -from rattail.db import model +from rattail.db.model import ImporterBatch import colander @@ -37,7 +37,7 @@ class ImporterBatchView(BatchMasterView): """ Master view for importer batches. """ - model_class = model.ImporterBatch + model_class = ImporterBatch default_handler_spec = 'rattail.batch.importer:ImporterBatchHandler' route_prefix = 'batch.importer' url_prefix = '/batches/importer' @@ -91,7 +91,7 @@ class ImporterBatchView(BatchMasterView): ] def configure_form(self, f): - super(ImporterBatchView, self).configure_form(f) + super().configure_form(f) # readonly fields f.set_readonly('import_handler_spec') @@ -110,21 +110,21 @@ class ImporterBatchView(BatchMasterView): self.make_row_table(batch.row_table) kwargs['rows'] = self.Session.query(self.current_row_table).all() kwargs.setdefault('status_enum', self.enum.IMPORTER_BATCH_ROW_STATUS) - breakdown = super(ImporterBatchView, self).make_status_breakdown( - batch, **kwargs) + breakdown = super().make_status_breakdown(batch, **kwargs) return breakdown def delete_instance(self, batch): self.make_row_table(batch.row_table) if self.current_row_table is not None: self.current_row_table.drop() - super(ImporterBatchView, self).delete_instance(batch) + super().delete_instance(batch) def make_row_table(self, name): if not hasattr(self, 'current_row_table'): - metadata = sa.MetaData(schema='batch', bind=self.Session.bind) + metadata = sa.MetaData(schema='batch') try: - self.current_row_table = sa.Table(name, metadata, autoload=True) + self.current_row_table = sa.Table(name, metadata, + autoload_with=self.Session.bind) except sa.exc.NoSuchTableError: self.current_row_table = None @@ -136,7 +136,7 @@ class ImporterBatchView(BatchMasterView): return self.enum.IMPORTER_BATCH_ROW_STATUS def configure_row_grid(self, g): - super(ImporterBatchView, self).configure_row_grid(g) + super().configure_row_grid(g) def make_filter(field, **kwargs): column = getattr(self.current_row_table.c, field) @@ -190,7 +190,7 @@ class ImporterBatchView(BatchMasterView): def get_parent(self, row): uuid = self.current_row_table.name - return self.Session.get(model.ImporterBatch, uuid) + return self.Session.get(ImporterBatch, uuid) def get_row_instance_title(self, row): if row.object_str: @@ -242,7 +242,7 @@ class ImporterBatchView(BatchMasterView): kwargs.setdefault('schema', colander.Schema()) kwargs.setdefault('cancel_url', None) - return super(ImporterBatchView, self).make_row_form(instance=row, **kwargs) + return super().make_row_form(instance=row, **kwargs) def configure_row_form(self, f): """ @@ -291,7 +291,7 @@ class ImporterBatchView(BatchMasterView): ] def get_row_xlsx_row(self, row, fields): - xlrow = super(ImporterBatchView, self).get_row_xlsx_row(row, fields) + xlrow = super().get_row_xlsx_row(row, fields) xlrow['status'] = self.enum.IMPORTER_BATCH_ROW_STATUS[row.status_code] From 27fce173cefef545e19bd834171d1c685d853fb8 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 26 Mar 2024 11:48:52 -0500 Subject: [PATCH 014/357] Fix how row grid values are fetched, for row proxy objects per changes coming in SQLAlchemy 2.0 --- tailbone/grids/core.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tailbone/grids/core.py b/tailbone/grids/core.py index 7a0d00e3..41964648 100644 --- a/tailbone/grids/core.py +++ b/tailbone/grids/core.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -33,7 +33,6 @@ from sqlalchemy import orm from rattail.db.types import GPCType from rattail.util import prettify, pretty_boolean, pretty_quantity -from rattail.time import localtime import webhelpers2_grid from pyramid.renderers import render @@ -478,6 +477,11 @@ class Grid(object): :returns: The value, or ``None`` if no value was found. """ + # TODO: this seems a little hacky, is there a better way? + # nb. this may only be relevant for import/export batch view? + if isinstance(obj, sa.engine.Row): + return obj._mapping[column_name] + try: return obj[column_name] except KeyError: @@ -503,7 +507,8 @@ class Grid(object): value = self.obtain_value(obj, column_name) if value is None: return "" - value = localtime(self.request.rattail_config, value) + app = self.request.rattail_config.get_app() + value = app.localtime(value) return raw_datetime(self.request.rattail_config, value) def render_enum(self, obj, column_name): @@ -1724,7 +1729,7 @@ class CustomWebhelpersGrid(webhelpers2_grid.Grid): self.renderers = kwargs.pop('renderers', {}) self.linked_columns = kwargs.pop('linked_columns', []) self.extra_record_class = kwargs.pop('extra_record_class', None) - super(CustomWebhelpersGrid, self).__init__(itemlist, columns, **kwargs) + super().__init__(itemlist, columns, **kwargs) def generate_header_link(self, column_number, column, label_text): From 4363b7c5d738d951483a42947a1c38557dd50646 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 26 Mar 2024 12:53:20 -0500 Subject: [PATCH 015/357] Update changelog --- CHANGES.rst | 7 +++++++ tailbone/_version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 174c06ae..4e96d2e1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,13 @@ CHANGELOG ========= +0.9.88 (2024-03-26) +------------------- + +* Update some SQLAlchemy logic per upcoming 2.0 changes. + + + 0.9.87 (2023-12-26) ------------------- diff --git a/tailbone/_version.py b/tailbone/_version.py index 5c813a10..86e8f57c 100644 --- a/tailbone/_version.py +++ b/tailbone/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.9.87' +__version__ = '0.9.88' From dfdb7a9b59e8c10a551e7003cebca50a50438846 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 27 Mar 2024 13:11:03 -0500 Subject: [PATCH 016/357] Fix bulk-delete rows for import/export batch per changes in SQLAlchemy 1.4 --- CHANGES.rst | 7 ++++++- tailbone/views/batch/importer.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 4e96d2e1..1717910f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,13 +2,18 @@ CHANGELOG ========= +Unreleased +---------- + +* Fix bulk-delete rows for import/export batch. + + 0.9.88 (2024-03-26) ------------------- * Update some SQLAlchemy logic per upcoming 2.0 changes. - 0.9.87 (2023-12-26) ------------------- diff --git a/tailbone/views/batch/importer.py b/tailbone/views/batch/importer.py index a5916448..962093da 100644 --- a/tailbone/views/batch/importer.py +++ b/tailbone/views/batch/importer.py @@ -277,7 +277,7 @@ class ImporterBatchView(BatchMasterView): query = self.get_effective_row_data(sort=False) batch.rowcount -= query.count() delete_query = self.current_row_table.delete().where(self.current_row_table.c.uuid.in_([row.uuid for row in query])) - delete_query.execute() + self.Session.bind.execute(delete_query) return self.redirect(self.get_action_url('view', batch)) def get_row_xlsx_fields(self): From cdc857065b42fd82eb0b29409e276819231f4b09 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 27 Mar 2024 13:14:23 -0500 Subject: [PATCH 017/357] Update changelog --- CHANGES.rst | 3 +++ tailbone/_version.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1717910f..38c3b959 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ CHANGELOG Unreleased ---------- +0.9.89 (2024-03-27) +------------------- + * Fix bulk-delete rows for import/export batch. diff --git a/tailbone/_version.py b/tailbone/_version.py index 86e8f57c..a8c7fe3a 100644 --- a/tailbone/_version.py +++ b/tailbone/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.9.88' +__version__ = '0.9.89' From 1889f7d2697c2741c90594ce55d8fb7c96daa2fa Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Apr 2024 18:05:27 -0500 Subject: [PATCH 018/357] Add basic CRUD for Person "preferred first name" only shown if config flag says so --- CHANGES.rst | 3 + .../templates/people/view_profile_buefy.mako | 37 ++++++++-- tailbone/views/people.py | 68 +++++++++++++++---- 3 files changed, 91 insertions(+), 17 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 38c3b959..1d8d63d3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ CHANGELOG Unreleased ---------- +* Add basic CRUD for Person "preferred first name". + + 0.9.89 (2024-03-27) ------------------- diff --git a/tailbone/templates/people/view_profile_buefy.mako b/tailbone/templates/people/view_profile_buefy.mako index 4b1e089c..81243464 100644 --- a/tailbone/templates/people/view_profile_buefy.mako +++ b/tailbone/templates/people/view_profile_buefy.mako @@ -91,6 +91,12 @@ {{ person.first_name }} + % if use_preferred_first_name: + + {{ person.preferred_first_name }} + + % endif + {{ person.middle_name }} @@ -118,11 +124,25 @@
- - - + + + + + + + + + % if use_preferred_first_name: + + + + + % endif + + @@ -1497,6 +1517,9 @@ % if request.has_perm('people_profile.edit_person'): editNameShowDialog: false, editNameFirst: null, + % if use_preferred_first_name: + editNameFirstPreferred: null, + % endif editNameMiddle: null, editNameLast: null, @@ -1590,6 +1613,9 @@ editNameInit() { this.editNameFirst = this.person.first_name + % if use_preferred_first_name: + this.editNameFirstPreferred = this.person.preferred_first_name + % endif this.editNameMiddle = this.person.middle_name this.editNameLast = this.person.last_name this.editNameShowDialog = true @@ -1599,6 +1625,9 @@ let url = '${url('people.profile_edit_name', uuid=person.uuid)}' let params = { first_name: this.editNameFirst, + % if use_preferred_first_name: + preferred_first_name: this.editNameFirstPreferred, + % endif middle_name: this.editNameMiddle, last_name: this.editNameLast, } diff --git a/tailbone/views/people.py b/tailbone/views/people.py index 7f786ace..071e58b5 100644 --- a/tailbone/views/people.py +++ b/tailbone/views/people.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -32,7 +32,8 @@ import sqlalchemy as sa from sqlalchemy import orm import sqlalchemy_continuum as continuum -from rattail.db import model, api +from rattail.db import api +from rattail.db.model import Person, PersonNote, MergePeopleRequest from rattail.db.util import maxlen from rattail.time import localtime from rattail.util import simple_error @@ -53,7 +54,7 @@ class PersonView(MasterView): """ Master view for the Person class. """ - model_class = model.Person + model_class = Person model_title_plural = "People" route_prefix = 'people' touchable = True @@ -210,6 +211,7 @@ class PersonView(MasterView): c="MR") def get_instance(self): + model = self.model # TODO: I don't recall why this fallback check for a vendor contact # exists here, but leaving it intact for now. key = self.request.matchdict['uuid'] @@ -237,6 +239,13 @@ class PersonView(MasterView): return True return not self.is_person_protected(person) + def configure_form(self, f): + super().configure_form(f) + + # preferred_first_name + if self.people_handler.should_use_preferred_first_name(): + f.insert_after('first_name', 'preferred_first_name') + def objectify(self, form, data=None): if data is None: data = form.validated @@ -248,6 +257,9 @@ class PersonView(MasterView): names = {} if 'first_name' in form: names['first'] = data['first_name'] + if self.people_handler.should_use_preferred_first_name(): + if 'preferred_first_name' in form: + names['preferred_first'] = data['preferred_first_name'] if 'middle_name' in form: names['middle'] = data['middle_name'] if 'last_name' in form: @@ -292,6 +304,8 @@ class PersonView(MasterView): In addition to "touching" the person proper, we also "touch" each contact info record associated with them. """ + model = self.model + # touch person, as per usual super().touch_instance(person) @@ -426,6 +440,7 @@ class PersonView(MasterView): return "" def get_version_child_classes(self): + model = self.model return [ (model.PersonPhoneNumber, 'parent_uuid'), (model.PersonEmailAddress, 'parent_uuid'), @@ -474,6 +489,7 @@ class PersonView(MasterView): 'expose_customer_people': self.customers_should_expose_people(), 'expose_customer_shoppers': self.customers_should_expose_shoppers(), 'max_one_member': app.get_membership_handler().max_one_per_person(), + 'use_preferred_first_name': self.people_handler.should_use_preferred_first_name(), } if self.request.has_perm('people_profile.view_versions'): @@ -552,7 +568,7 @@ class PersonView(MasterView): def get_max_lengths(self): model = self.model - return { + lengths = { 'person_first_name': maxlen(model.Person.first_name), 'person_middle_name': maxlen(model.Person.middle_name), 'person_last_name': maxlen(model.Person.last_name), @@ -562,6 +578,9 @@ class PersonView(MasterView): 'address_state': maxlen(model.PersonMailingAddress.state), 'address_zipcode': maxlen(model.PersonMailingAddress.zipcode), } + if self.people_handler.should_use_preferred_first_name(): + lengths['person_preferred_first_name'] = maxlen(model.Person.preferred_first_name) + return lengths def get_phone_type_options(self): """ @@ -606,6 +625,9 @@ class PersonView(MasterView): 'dynamic_content_title': self.get_context_content_title(person), } + if self.people_handler.should_use_preferred_first_name(): + context['preferred_first_name'] = person.preferred_first_name + if person.address: context['address'] = self.get_context_address(person.address) @@ -871,10 +893,16 @@ class PersonView(MasterView): person = self.get_instance() data = dict(self.request.json_body) - self.handler.update_names(person, - first=data['first_name'], - middle=data['middle_name'], - last=data['last_name']) + kw = { + 'first': data['first_name'], + 'middle': data['middle_name'], + 'last': data['last_name'], + } + + if self.people_handler.should_use_preferred_first_name(): + kw['preferred_first'] = data['preferred_first_name'] + + self.handler.update_names(person, **kw) self.Session.flush() return self.profile_changed_response(person) @@ -913,6 +941,7 @@ class PersonView(MasterView): """ View which updates a phone number for the person. """ + model = self.model person = self.get_instance() data = dict(self.request.json_body) @@ -940,6 +969,7 @@ class PersonView(MasterView): """ View which allows a person's phone number to be deleted. """ + model = self.model person = self.get_instance() data = dict(self.request.json_body) @@ -960,6 +990,7 @@ class PersonView(MasterView): """ View which allows a person's "preferred" phone to be set. """ + model = self.model person = self.get_instance() data = dict(self.request.json_body) @@ -1016,6 +1047,7 @@ class PersonView(MasterView): """ View which updates an email address for the person. """ + model = self.model person = self.get_instance() data = dict(self.request.json_body) @@ -1039,6 +1071,7 @@ class PersonView(MasterView): """ View which allows a person's email address to be deleted. """ + model = self.model person = self.get_instance() data = dict(self.request.json_body) @@ -1059,6 +1092,7 @@ class PersonView(MasterView): """ View which allows a person's "preferred" email to be set. """ + model = self.model person = self.get_instance() data = dict(self.request.json_body) @@ -1192,6 +1226,7 @@ class PersonView(MasterView): """ AJAX view for updating an employee history record. """ + model = self.model person = self.get_instance() employee = person.employee @@ -1459,6 +1494,7 @@ class PersonView(MasterView): return self.profile_changed_response(person) def create_note(self, person, form): + model = self.model note = model.PersonNote() note.type = form.validated['note_type'] note.subject = form.validated['note_subject'] @@ -1478,6 +1514,7 @@ class PersonView(MasterView): return self.profile_changed_response(person) def update_note(self, person, form): + model = self.model note = self.Session.get(model.PersonNote, form.validated['uuid']) note.subject = form.validated['note_subject'] note.text = form.validated['note_text'] @@ -1494,10 +1531,12 @@ class PersonView(MasterView): return self.profile_changed_response(person) def delete_note(self, person, form): + model = self.model note = self.Session.get(model.PersonNote, form.validated['uuid']) self.Session.delete(note) def make_user(self): + model = self.model uuid = self.request.POST['person_uuid'] person = self.Session.get(model.Person, uuid) if not person: @@ -1815,7 +1854,7 @@ class PersonNoteView(MasterView): """ Master view for the PersonNote class. """ - model_class = model.PersonNote + model_class = PersonNote route_prefix = 'person_notes' url_prefix = '/people/notes' has_versions = True @@ -1842,6 +1881,7 @@ class PersonNoteView(MasterView): def configure_grid(self, g): super().configure_grid(g) + model = self.model # person g.set_joiner('person', lambda q: q.join(model.Person, @@ -1881,7 +1921,7 @@ def valid_note_uuid(node, kw): session = kw['session'] person_uuid = kw['person_uuid'] def validate(node, value): - note = session.get(model.PersonNote, value) + note = session.get(PersonNote, value) if not note: raise colander.Invalid(node, "Note not found") if note.person.uuid != person_uuid: @@ -1906,7 +1946,7 @@ class MergePeopleRequestView(MasterView): """ Master view for the MergePeopleRequest class. """ - model_class = model.MergePeopleRequest + model_class = MergePeopleRequest route_prefix = 'people_merge_requests' url_prefix = '/people/merge-requests' creatable = False @@ -1950,8 +1990,9 @@ class MergePeopleRequestView(MasterView): g.set_link('keeping_uuid') def render_referenced_person_name(self, merge_request, field): + model = self.model uuid = getattr(merge_request, field) - person = self.Session.get(self.model.Person, uuid) + person = self.Session.get(model.Person, uuid) if person: return str(person) return "(person not found)" @@ -1971,8 +2012,9 @@ class MergePeopleRequestView(MasterView): f.set_renderer('keeping_uuid', self.render_referenced_person) def render_referenced_person(self, merge_request, field): + model = self.model uuid = getattr(merge_request, field) - person = self.Session.get(self.model.Person, uuid) + person = self.Session.get(model.Person, uuid) if person: text = str(person) url = self.request.route_url('people.view', uuid=person.uuid) From e0dc858451646a6fef744f2e6c07a34632fe2191 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Apr 2024 18:28:39 -0500 Subject: [PATCH 019/357] Update changelog --- CHANGES.rst | 3 +++ tailbone/_version.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1d8d63d3..400557d3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ CHANGELOG Unreleased ---------- +0.9.90 (2024-04-01) +------------------- + * Add basic CRUD for Person "preferred first name". diff --git a/tailbone/_version.py b/tailbone/_version.py index a8c7fe3a..cff6f04f 100644 --- a/tailbone/_version.py +++ b/tailbone/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8; -*- -__version__ = '0.9.89' +__version__ = '0.9.90' From a1b05540bed9e301de9936d67ff4722ce684bc9e Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 10 Apr 2024 12:24:13 -0500 Subject: [PATCH 020/357] Avoid uncaught error when updating order batch row quantities --- tailbone/api/batch/ordering.py | 41 ++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/tailbone/api/batch/ordering.py b/tailbone/api/batch/ordering.py index 1661d06f..1b11194e 100644 --- a/tailbone/api/batch/ordering.py +++ b/tailbone/api/batch/ordering.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -28,18 +28,23 @@ API. """ import datetime +import logging -from rattail.db import model -from rattail.util import pretty_quantity +import sqlalchemy as sa + +from rattail.db.model import PurchaseBatch, PurchaseBatchRow from cornice import Service from tailbone.api.batch import APIBatchView, APIBatchRowView +log = logging.getLogger(__name__) + + class OrderingBatchViews(APIBatchView): - model_class = model.PurchaseBatch + model_class = PurchaseBatch default_handler_spec = 'rattail.batch.purchase:PurchaseBatchHandler' route_prefix = 'orderingbatchviews' permission_prefix = 'ordering' @@ -55,12 +60,13 @@ class OrderingBatchViews(APIBatchView): Adds a condition to the query, to ensure only purchase batches with "ordering" mode are returned. """ - query = super(OrderingBatchViews, self).base_query() + model = self.model + query = super().base_query() query = query.filter(model.PurchaseBatch.mode == self.enum.PURCHASE_BATCH_MODE_ORDERING) return query def normalize(self, batch): - data = super(OrderingBatchViews, self).normalize(batch) + data = super().normalize(batch) data['vendor_uuid'] = batch.vendor.uuid data['vendor_display'] = str(batch.vendor) @@ -81,7 +87,7 @@ class OrderingBatchViews(APIBatchView): """ data = dict(data) data['mode'] = self.enum.PURCHASE_BATCH_MODE_ORDERING - batch = super(OrderingBatchViews, self).create_object(data) + batch = super().create_object(data) return batch def worksheet(self): @@ -221,7 +227,7 @@ class OrderingBatchViews(APIBatchView): class OrderingBatchRowViews(APIBatchRowView): - model_class = model.PurchaseBatchRow + model_class = PurchaseBatchRow default_handler_spec = 'rattail.batch.purchase:PurchaseBatchHandler' route_prefix = 'ordering.rows' permission_prefix = 'ordering' @@ -231,8 +237,9 @@ class OrderingBatchRowViews(APIBatchRowView): editable = True def normalize(self, row): + data = super().normalize(row) + app = self.get_rattail_app() batch = row.batch - data = super(OrderingBatchRowViews, self).normalize(row) data['item_id'] = row.item_id data['upc'] = str(row.upc) @@ -252,8 +259,8 @@ class OrderingBatchRowViews(APIBatchRowView): data['case_quantity'] = row.case_quantity data['cases_ordered'] = row.cases_ordered data['units_ordered'] = row.units_ordered - data['cases_ordered_display'] = pretty_quantity(row.cases_ordered or 0, empty_zero=False) - data['units_ordered_display'] = pretty_quantity(row.units_ordered or 0, empty_zero=False) + data['cases_ordered_display'] = app.render_quantity(row.cases_ordered or 0, empty_zero=False) + data['units_ordered_display'] = app.render_quantity(row.units_ordered or 0, empty_zero=False) data['po_unit_cost'] = row.po_unit_cost data['po_unit_cost_display'] = "${:0.2f}".format(row.po_unit_cost) if row.po_unit_cost is not None else None @@ -281,7 +288,17 @@ class OrderingBatchRowViews(APIBatchRowView): if not self.batch_handler.is_mutable(row.batch): return {'error': "Batch is not mutable"} - self.batch_handler.update_row_quantity(row, **data) + try: + self.batch_handler.update_row_quantity(row, **data) + self.Session.flush() + except Exception as error: + log.warning("update_row_quantity failed", exc_info=True) + if isinstance(error, sa.exc.DataError) and hasattr(error, 'orig'): + error = str(error.orig) + else: + error = str(error) + return {'error': error} + return row From de8751b86c6dffb5c32ca9e01d01139ef8de18b6 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 11 Apr 2024 14:14:27 -0500 Subject: [PATCH 021/357] Try to return JSON error when receiving API call fails although in my testing, the error still got raised somehow in the tweens or something? client then sees it as a 500 response and gets no JSON --- tailbone/api/batch/receiving.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tailbone/api/batch/receiving.py b/tailbone/api/batch/receiving.py index f8ce4a33..daa4290f 100644 --- a/tailbone/api/batch/receiving.py +++ b/tailbone/api/batch/receiving.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -27,6 +27,7 @@ Tailbone Web API - Receiving Batches import logging import humanize +import sqlalchemy as sa from rattail.db import model from rattail.util import pretty_quantity @@ -440,9 +441,17 @@ class ReceivingBatchRowViews(APIBatchRowView): # handler takes care of the row receiving logic for us kwargs = dict(form.validated) del kwargs['row'] - self.batch_handler.receive_row(row, **kwargs) + try: + self.batch_handler.receive_row(row, **kwargs) + self.Session.flush() + except Exception as error: + log.warning("receive() failed", exc_info=True) + if isinstance(error, sa.exc.DataError) and hasattr(error, 'orig'): + error = str(error.orig) + else: + error = str(error) + return {'error': error} - self.Session.flush() return self._get(obj=row) @classmethod From aa500351edd6fa610c3395cdb08900bb0876a7ab Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 11 Apr 2024 16:37:55 -0500 Subject: [PATCH 022/357] Avoid error for tax field when creating new department someday should fix that for real.. --- tailbone/views/departments.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tailbone/views/departments.py b/tailbone/views/departments.py index a062b183..01d6f520 100644 --- a/tailbone/views/departments.py +++ b/tailbone/views/departments.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -111,9 +111,13 @@ class DepartmentView(MasterView): f.set_type('personnel', 'boolean') # tax - f.set_renderer('tax', self.render_tax) - # TODO: make this editable - f.set_readonly('tax') + if self.creating: + # TODO: make this editable instead + f.remove('tax') + else: + f.set_renderer('tax', self.render_tax) + # TODO: make this editable + f.set_readonly('tax') # default_custorder_discount f.set_type('default_custorder_discount', 'percent') From cbbd77c49c403e827c540ca21b1302ca0a18db08 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 11 Apr 2024 16:58:12 -0500 Subject: [PATCH 023/357] Show toast msg instead of silent error, when grid fetch fails specifically, if a user clicks "Save defaults" for the grid filters, but they aren't currently logged in, error will ensue. this is a bit of an edge case which IIUC would require multiple tabs etc. but still is worth avoiding an error email from it. --- tailbone/templates/grids/buefy.mako | 32 +++++++++++++++-------- tailbone/views/master.py | 40 +++++++++++++++++++---------- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/tailbone/templates/grids/buefy.mako b/tailbone/templates/grids/buefy.mako index a3e6e229..cbe33062 100644 --- a/tailbone/templates/grids/buefy.mako +++ b/tailbone/templates/grids/buefy.mako @@ -584,16 +584,28 @@ this.loading = true this.$http.get(`${'$'}{this.ajaxDataUrl}?${'$'}{params}`).then(({ data }) => { - ${grid.component_studly}CurrentData = data.data - this.data = ${grid.component_studly}CurrentData - this.rowStatusMap = data.row_status_map - this.total = data.total_items - this.firstItem = data.first_item - this.lastItem = data.last_item - this.loading = false - this.checkedRows = this.locateCheckedRows(data.checked_rows) - if (success) { - success() + if (!data.error) { + ${grid.component_studly}CurrentData = data.data + this.data = ${grid.component_studly}CurrentData + this.rowStatusMap = data.row_status_map + this.total = data.total_items + this.firstItem = data.first_item + this.lastItem = data.last_item + this.loading = false + this.checkedRows = this.locateCheckedRows(data.checked_rows) + if (success) { + success() + } + } else { + this.$buefy.toast.open({ + message: data.error, + type: 'is-danger', + duration: 2000, // 4 seconds + }) + this.loading = false + if (failure) { + failure() + } } }) .catch((error) => { diff --git a/tailbone/views/master.py b/tailbone/views/master.py index cc2adcaf..c9d6cd7c 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -42,8 +42,7 @@ from sqlalchemy_utils.functions import get_primary_keys, get_columns from rattail.db import model, Session as RattailSession from rattail.db.continuum import model_transaction_query -from rattail.util import prettify, simple_error, get_class_hierarchy -from rattail.time import localtime +from rattail.util import simple_error, get_class_hierarchy from rattail.threads import Thread from rattail.csvutil import UnicodeDictWriter from rattail.files import temp_path @@ -324,6 +323,13 @@ class MasterView(View): string, then the view will return the rendered grid only. Otherwise returns the full page. """ + # nb. normally this "save defaults" flag is checked within make_grid() + # but it returns JSON data so we can't just do a redirect when there + # is no user; must return JSON error message instead + if (self.request.GET.get('save-current-filters-as-defaults') == 'true' + and not self.request.user): + return self.json_response({'error': "User is not currently logged in"}) + self.listing = True grid = self.make_grid() @@ -1465,6 +1471,7 @@ class MasterView(View): """ View showing diff details of a particular object version. """ + app = self.get_rattail_app() instance = self.get_instance() model_class = self.get_model_class() route_prefix = self.get_route_prefix() @@ -1512,7 +1519,7 @@ class MasterView(View): 'instance_title_normal': instance_title, 'instance_url': self.get_action_url('versions', instance), 'transaction': transaction, - 'changed': localtime(self.rattail_config, transaction.issued_at, from_utc=True), + 'changed': app.localtime(transaction.issued_at, from_utc=True), 'version_diffs': version_diffs, 'show_prev_next': True, 'prev_url': prev_url, @@ -3502,14 +3509,14 @@ class MasterView(View): Normalize the given object into a data dict, for use when writing to the results file for download. """ + app = self.get_rattail_app() data = {} for field in fields: value = getattr(obj, field, None) # make timestamps zone-aware if isinstance(value, datetime.datetime): - value = localtime(self.rattail_config, value, - from_utc=not self.has_local_times) + value = app.localtime(value, from_utc=not self.has_local_times) data[field] = value @@ -3539,13 +3546,14 @@ class MasterView(View): Coerce the given data dict record, to a "row" dict suitable for use when writing directly to XLSX file. """ + app = self.get_rattail_app() data = dict(data) for key in data: value = data[key] # make timestamps local, "zone-naive" if isinstance(value, datetime.datetime): - value = localtime(self.rattail_config, value, tzinfo=False) + value = app.localtime(value, tzinfo=False) data[key] = value @@ -4001,14 +4009,14 @@ class MasterView(View): Normalize the given row object into a data dict, for use when writing to the results file for download. """ + app = self.get_rattail_app() data = {} for field in fields: value = getattr(row, field, None) # make timestamps zone-aware if isinstance(value, datetime.datetime): - value = localtime(self.rattail_config, value, - from_utc=not self.has_local_times) + value = app.localtime(value, from_utc=not self.has_local_times) data[field] = value @@ -4038,6 +4046,7 @@ class MasterView(View): Coerce the given data dict record, to a "row" dict suitable for use when writing directly to XLSX file. """ + app = self.get_rattail_app() data = dict(data) for key in data: value = data[key] @@ -4048,7 +4057,7 @@ class MasterView(View): # make timestamps local, "zone-naive" elif isinstance(value, datetime.datetime): - value = localtime(self.rattail_config, value, tzinfo=False) + value = app.localtime(value, tzinfo=False) data[key] = value @@ -4099,6 +4108,7 @@ class MasterView(View): """ Return a dict for use when writing the row's data to XLSX download. """ + app = self.get_rattail_app() xlrow = {} for field in fields: value = getattr(row, field, None) @@ -4111,9 +4121,9 @@ class MasterView(View): # but we should make sure they're in "local" time zone effectively. # note however, this assumes a "naive" time value is in UTC zone! if value.tzinfo: - value = localtime(self.rattail_config, value, tzinfo=False) + value = app.localtime(value, tzinfo=False) else: - value = localtime(self.rattail_config, value, from_utc=True, tzinfo=False) + value = app.localtime(value, from_utc=True, tzinfo=False) xlrow[field] = value return xlrow @@ -4177,12 +4187,13 @@ class MasterView(View): """ Return a dict for use when writing the row's data to CSV download. """ + app = self.get_rattail_app() csvrow = {} for field in fields: value = getattr(obj, field, None) if isinstance(value, datetime.datetime): # TODO: this assumes value is *always* naive UTC - value = localtime(self.rattail_config, value, from_utc=True) + value = app.localtime(value, from_utc=True) csvrow[field] = '' if value is None else str(value) return csvrow @@ -4190,12 +4201,13 @@ class MasterView(View): """ Return a dict for use when writing the row's data to CSV download. """ + app = self.get_rattail_app() csvrow = {} for field in fields: value = getattr(row, field, None) if isinstance(value, datetime.datetime): # TODO: this assumes value is *always* naive UTC - value = localtime(self.rattail_config, value, from_utc=True) + value = app.localtime(value, from_utc=True) csvrow[field] = '' if value is None else str(value) return csvrow From 1973614840f30b906b81e019e7f409695f6e37cf Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 13 Apr 2024 09:09:23 -0500 Subject: [PATCH 024/357] Rename people "view_profile" template (drop buefy suffix) --- ...w_profile_buefy.mako => view_profile.mako} | 0 tailbone/views/people.py | 34 +++++++------------ 2 files changed, 12 insertions(+), 22 deletions(-) rename tailbone/templates/people/{view_profile_buefy.mako => view_profile.mako} (100%) diff --git a/tailbone/templates/people/view_profile_buefy.mako b/tailbone/templates/people/view_profile.mako similarity index 100% rename from tailbone/templates/people/view_profile_buefy.mako rename to tailbone/templates/people/view_profile.mako diff --git a/tailbone/views/people.py b/tailbone/views/people.py index 071e58b5..7b175e25 100644 --- a/tailbone/views/people.py +++ b/tailbone/views/people.py @@ -34,12 +34,9 @@ import sqlalchemy_continuum as continuum from rattail.db import api from rattail.db.model import Person, PersonNote, MergePeopleRequest -from rattail.db.util import maxlen -from rattail.time import localtime from rattail.util import simple_error import colander -from pyramid.httpexceptions import HTTPFound, HTTPNotFound from webhelpers2.html import HTML, tags from tailbone import forms, grids @@ -221,7 +218,7 @@ class PersonView(MasterView): instance = self.Session.get(model.VendorContact, key) if instance: return instance.person - raise HTTPNotFound + raise self.notfound() def is_person_protected(self, person): for user in person.users: @@ -495,7 +492,7 @@ class PersonView(MasterView): if self.request.has_perm('people_profile.view_versions'): context['revisions_grid'] = self.profile_revisions_grid(person) - return self.render_to_response('view_profile_buefy', context) + return self.render_to_response('view_profile', context) def get_context_tabchecks(self, person): app = self.get_rattail_app() @@ -558,28 +555,21 @@ class PersonView(MasterView): """ return kwargs - def template_kwargs_view_profile_buefy(self, **kwargs): - """ - Note that any subclass should not need to define this method. - It by default invokes :meth:`template_kwargs_view_profile()` - and returns that result. - """ - return self.template_kwargs_view_profile(**kwargs) - def get_max_lengths(self): + app = self.get_rattail_app() model = self.model lengths = { - 'person_first_name': maxlen(model.Person.first_name), - 'person_middle_name': maxlen(model.Person.middle_name), - 'person_last_name': maxlen(model.Person.last_name), - 'address_street': maxlen(model.PersonMailingAddress.street), - 'address_street2': maxlen(model.PersonMailingAddress.street2), - 'address_city': maxlen(model.PersonMailingAddress.city), - 'address_state': maxlen(model.PersonMailingAddress.state), - 'address_zipcode': maxlen(model.PersonMailingAddress.zipcode), + 'person_first_name': app.maxlen(model.Person.first_name), + 'person_middle_name': app.maxlen(model.Person.middle_name), + 'person_last_name': app.maxlen(model.Person.last_name), + 'address_street': app.maxlen(model.PersonMailingAddress.street), + 'address_street2': app.maxlen(model.PersonMailingAddress.street2), + 'address_city': app.maxlen(model.PersonMailingAddress.city), + 'address_state': app.maxlen(model.PersonMailingAddress.state), + 'address_zipcode': app.maxlen(model.PersonMailingAddress.zipcode), } if self.people_handler.should_use_preferred_first_name(): - lengths['person_preferred_first_name'] = maxlen(model.Person.preferred_first_name) + lengths['person_preferred_first_name'] = app.maxlen(model.Person.preferred_first_name) return lengths def get_phone_type_options(self): From cd7c1bba21292bc9d255e03d65694586bfbbd698 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 13 Apr 2024 09:21:48 -0500 Subject: [PATCH 025/357] Rename template for grid filters (drop buefy suffix) also remove some deprecated functions --- tailbone/config.py | 21 +---- tailbone/templates/grids/buefy.mako | 2 +- tailbone/templates/grids/filters.mako | 98 ++++++++++++++------- tailbone/templates/grids/filters_buefy.mako | 70 --------------- 4 files changed, 67 insertions(+), 124 deletions(-) delete mode 100644 tailbone/templates/grids/filters_buefy.mako diff --git a/tailbone/config.py b/tailbone/config.py index 6106e87e..9326a3cb 100644 --- a/tailbone/config.py +++ b/tailbone/config.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -61,25 +61,6 @@ def csrf_header_name(config): return config.get('tailbone', 'csrf_header_name', default='X-CSRF-TOKEN') -def get_buefy_version(config): - warnings.warn("get_buefy_version() is deprecated; please use " - "tailbone.util.get_libver() instead", - DeprecationWarning, stacklevel=2) - - version = config.get('tailbone', 'libver.buefy') - if version: - return version - - return config.get('tailbone', 'buefy_version', - default='latest') - - -def get_buefy_0_8(config, version=None): - warnings.warn("get_buefy_0_8() is no longer supported", - DeprecationWarning, stacklevel=2) - return False - - def global_help_url(config): return config.get('tailbone', 'global_help_url') diff --git a/tailbone/templates/grids/buefy.mako b/tailbone/templates/grids/buefy.mako index cbe33062..73c7e415 100644 --- a/tailbone/templates/grids/buefy.mako +++ b/tailbone/templates/grids/buefy.mako @@ -136,7 +136,7 @@
% if grid.filterable: ## TODO: stop using |n filter - ${grid.render_filters(template='/grids/filters_buefy.mako', allow_save_defaults=allow_save_defaults)|n} + ${grid.render_filters(allow_save_defaults=allow_save_defaults)|n} % endif
diff --git a/tailbone/templates/grids/filters.mako b/tailbone/templates/grids/filters.mako index 857f53b1..5e1fef9b 100644 --- a/tailbone/templates/grids/filters.mako +++ b/tailbone/templates/grids/filters.mako @@ -1,38 +1,70 @@ ## -*- coding: utf-8; -*- -
- ${h.form(form.action_url, method='get')} - ${h.hidden('reset-to-default-filters', value='false')} - ${h.hidden('save-current-filters-as-defaults', value='false')} +
-
- Filters - % for filtr in form.iter_filters(): - - % endfor -
+ + -
- - - - - % if allow_save_defaults and request.user: - - % endif -
+ - ${h.end_form()} -
+ + Apply Filters + + + + Add Filter + + + + + + + Default View + + + + No Filters + + + % if allow_save_defaults and request.user: + + Save Defaults + + % endif + + + + diff --git a/tailbone/templates/grids/filters_buefy.mako b/tailbone/templates/grids/filters_buefy.mako deleted file mode 100644 index 5e1fef9b..00000000 --- a/tailbone/templates/grids/filters_buefy.mako +++ /dev/null @@ -1,70 +0,0 @@ -## -*- coding: utf-8; -*- - -
- - - - - - - - Apply Filters - - - - Add Filter - - - - - - - Default View - - - - No Filters - - - % if allow_save_defaults and request.user: - - Save Defaults - - % endif - - - -
From 1103b09a767936f69c02c5714717cf5d1d28bee9 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 13 Apr 2024 09:45:10 -0500 Subject: [PATCH 026/357] Rename forms/deform template (drop buefy suffix) for now, deprecate `form.render()` method and just use `render_deform()` - but probably should change that to something else eventually..? --- tailbone/forms/core.py | 17 ++++++++--------- tailbone/templates/batch/view.mako | 4 ++-- tailbone/templates/form.mako | 2 +- .../forms/{deform_buefy.mako => deform.mako} | 0 tailbone/templates/forms/form.mako | 2 -- tailbone/templates/products/batch.mako | 2 +- 6 files changed, 12 insertions(+), 15 deletions(-) rename tailbone/templates/forms/{deform_buefy.mako => deform.mako} (100%) delete mode 100644 tailbone/templates/forms/form.mako diff --git a/tailbone/forms/core.py b/tailbone/forms/core.py index e04126a3..aee85330 100644 --- a/tailbone/forms/core.py +++ b/tailbone/forms/core.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2023 Lance Edgar +# Copyright © 2010-2024 Lance Edgar # # This file is part of Rattail. # @@ -794,12 +794,11 @@ class Form(object): def set_vuejs_field_converter(self, field, converter): self.vuejs_field_converters[field] = converter - def render(self, template=None, **kwargs): - if not template: - template = '/forms/form.mako' - context = kwargs - context['form'] = self - return render(template, context) + def render(self, **kwargs): + warnings.warn("Form.render() is deprecated (for now?); " + "please use Form.render_deform() instead", + DeprecationWarning, stacklevel=2) + return self.render_deform(**kwargs) def make_deform_form(self): if not hasattr(self, 'deform_form'): @@ -841,14 +840,14 @@ class Form(object): def render_deform(self, dform=None, template=None, **kwargs): if not template: - template = '/forms/deform_buefy.mako' + template = '/forms/deform.mako' if dform is None: dform = self.make_deform_form() # TODO: would perhaps be nice to leverage deform's default rendering # someday..? i.e. using Chameleon *.pt templates - # return form.render() + # return dform.render() context = kwargs context['form'] = self diff --git a/tailbone/templates/batch/view.mako b/tailbone/templates/batch/view.mako index fa8fa19f..aa9677b7 100644 --- a/tailbone/templates/batch/view.mako +++ b/tailbone/templates/batch/view.mako @@ -150,8 +150,8 @@ <%def name="render_form()"> ## TODO: should use self.render_form_buttons() - ## ${form.render(form_id='batch-form', buttons=capture(self.render_form_buttons))|n} - ${form.render(form_id='batch-form', buttons=capture(buttons))|n} + ## ${form.render_deform(form_id='batch-form', buttons=capture(self.render_form_buttons))|n} + ${form.render_deform(form_id='batch-form', buttons=capture(buttons))|n} <%def name="render_this_page()"> diff --git a/tailbone/templates/form.mako b/tailbone/templates/form.mako index 5878e030..c225bd3a 100644 --- a/tailbone/templates/form.mako +++ b/tailbone/templates/form.mako @@ -6,7 +6,7 @@ <%def name="render_form_buttons()"> <%def name="render_form()"> - ${form.render(buttons=capture(self.render_form_buttons))|n} + ${form.render_deform(buttons=capture(self.render_form_buttons))|n} <%def name="render_buefy_form()"> diff --git a/tailbone/templates/forms/deform_buefy.mako b/tailbone/templates/forms/deform.mako similarity index 100% rename from tailbone/templates/forms/deform_buefy.mako rename to tailbone/templates/forms/deform.mako diff --git a/tailbone/templates/forms/form.mako b/tailbone/templates/forms/form.mako deleted file mode 100644 index cd8fecc8..00000000 --- a/tailbone/templates/forms/form.mako +++ /dev/null @@ -1,2 +0,0 @@ -## -*- coding: utf-8; -*- -${form.render_deform(buttons=buttons)|n} diff --git a/tailbone/templates/products/batch.mako b/tailbone/templates/products/batch.mako index 81af729b..868ad9b1 100644 --- a/tailbone/templates/products/batch.mako +++ b/tailbone/templates/products/batch.mako @@ -64,7 +64,7 @@ ${parent.modify_this_page_vars()} diff --git a/tailbone/templates/batch/importer/view_row.mako b/tailbone/templates/batch/importer/view_row.mako index 9e08cf43..7d6f121f 100644 --- a/tailbone/templates/batch/importer/view_row.mako +++ b/tailbone/templates/batch/importer/view_row.mako @@ -68,7 +68,7 @@ % endif -<%def name="render_buefy_form()"> +<%def name="render_form()">

diff --git a/tailbone/templates/batch/inventory/desktop_form.mako b/tailbone/templates/batch/inventory/desktop_form.mako index 9f13cbf9..7e4795a8 100644 --- a/tailbone/templates/batch/inventory/desktop_form.mako +++ b/tailbone/templates/batch/inventory/desktop_form.mako @@ -34,7 +34,7 @@ -<%def name="render_form()"> +<%def name="render_form_template()"> @@ -113,7 +113,7 @@ }, data() { return { - groupPermissions: ${json.dumps(buefy_perms.get(selected_group, {}).get('permissions', []))|n}, + groupPermissions: ${json.dumps(perms_data.get(selected_group, {}).get('permissions', []))|n}, permissionGroupTerm: '', permissionTerm: '', selectedGroup: ${json.dumps(selected_group)|n}, diff --git a/tailbone/templates/products/batch.mako b/tailbone/templates/products/batch.mako index 868ad9b1..e0b93bd6 100644 --- a/tailbone/templates/products/batch.mako +++ b/tailbone/templates/products/batch.mako @@ -54,7 +54,7 @@ ${h.end_form()} -<%def name="render_form()"> +<%def name="render_form_template()"> diff --git a/tailbone/templates/products/view.mako b/tailbone/templates/products/view.mako index 5de6d099..c4da08ba 100644 --- a/tailbone/templates/products/view.mako +++ b/tailbone/templates/products/view.mako @@ -108,7 +108,7 @@ <%def name="lookup_codes_grid()"> - ${lookup_codes['grid'].render_buefy_table_element(data_prop='lookupCodesData')|n} + ${lookup_codes['grid'].render_table_element(data_prop='lookupCodesData')|n} <%def name="lookup_codes_panel()"> @@ -121,7 +121,7 @@ <%def name="sources_grid()"> - ${vendor_sources['grid'].render_buefy_table_element(data_prop='vendorSourcesData')|n} + ${vendor_sources['grid'].render_table_element(data_prop='vendorSourcesData')|n} <%def name="sources_panel()"> @@ -175,7 +175,7 @@

- ${regular_price_history_grid.render_buefy_table_element(data_prop='regularPriceHistoryData', loading='regularPriceHistoryLoading', paginated=True, per_page=10)|n} + ${regular_price_history_grid.render_table_element(data_prop='regularPriceHistoryData', loading='regularPriceHistoryLoading', paginated=True, per_page=10)|n}