Normalize naming of all traditional master views
such names should never use plural forms. for now what plural forms were previously in use, should still work. ideally can remove those at some point
This commit is contained in:
parent
3ad19d05e5
commit
719e7c8441
30 changed files with 273 additions and 177 deletions
|
@ -2,7 +2,7 @@
|
|||
################################################################################
|
||||
#
|
||||
# Rattail -- Retail Software Framework
|
||||
# Copyright © 2010-2018 Lance Edgar
|
||||
# Copyright © 2010-2021 Lance Edgar
|
||||
#
|
||||
# This file is part of Rattail.
|
||||
#
|
||||
|
@ -40,7 +40,7 @@ from tailbone.views import MasterView
|
|||
from tailbone.util import raw_datetime
|
||||
|
||||
|
||||
class CustomerOrderItemsView(MasterView):
|
||||
class CustomerOrderItemView(MasterView):
|
||||
"""
|
||||
Master view for customer order items
|
||||
"""
|
||||
|
@ -100,7 +100,7 @@ class CustomerOrderItemsView(MasterView):
|
|||
.joinedload(model.CustomerOrder.person))
|
||||
|
||||
def configure_grid(self, g):
|
||||
super(CustomerOrderItemsView, self).configure_grid(g)
|
||||
super(CustomerOrderItemView, self).configure_grid(g)
|
||||
|
||||
g.set_joiner('person', lambda q: q.outerjoin(model.Person))
|
||||
|
||||
|
@ -134,7 +134,7 @@ class CustomerOrderItemsView(MasterView):
|
|||
return raw_datetime(self.rattail_config, value)
|
||||
|
||||
def configure_form(self, f):
|
||||
super(CustomerOrderItemsView, self).configure_form(f)
|
||||
super(CustomerOrderItemView, self).configure_form(f)
|
||||
|
||||
# order
|
||||
f.set_renderer('order', self.render_order)
|
||||
|
@ -176,12 +176,15 @@ class CustomerOrderItemsView(MasterView):
|
|||
model.CustomerOrderItemEvent.type_code)
|
||||
|
||||
def configure_row_grid(self, g):
|
||||
super(CustomerOrderItemsView, self).configure_row_grid(g)
|
||||
super(CustomerOrderItemView, self).configure_row_grid(g)
|
||||
g.set_label('occurred', "When")
|
||||
g.set_label('type_code', "What") # TODO: enum renderer
|
||||
g.set_label('user', "Who")
|
||||
g.set_label('note', "Notes")
|
||||
|
||||
# TODO: deprecate / remove this
|
||||
CustomerOrderItemsView = CustomerOrderItemView
|
||||
|
||||
|
||||
def includeme(config):
|
||||
CustomerOrderItemsView.defaults(config)
|
||||
CustomerOrderItemView.defaults(config)
|
||||
|
|
|
@ -42,7 +42,7 @@ from tailbone.db import Session
|
|||
from tailbone.views import MasterView
|
||||
|
||||
|
||||
class CustomerOrdersView(MasterView):
|
||||
class CustomerOrderView(MasterView):
|
||||
"""
|
||||
Master view for customer orders
|
||||
"""
|
||||
|
@ -74,7 +74,7 @@ class CustomerOrdersView(MasterView):
|
|||
.options(orm.joinedload(model.CustomerOrder.customer))
|
||||
|
||||
def configure_grid(self, g):
|
||||
super(CustomerOrdersView, self).configure_grid(g)
|
||||
super(CustomerOrderView, self).configure_grid(g)
|
||||
|
||||
g.set_joiner('customer', lambda q: q.outerjoin(model.Customer))
|
||||
g.set_joiner('person', lambda q: q.outerjoin(model.Person))
|
||||
|
@ -98,7 +98,7 @@ class CustomerOrdersView(MasterView):
|
|||
g.set_label('id', "ID")
|
||||
|
||||
def configure_form(self, f):
|
||||
super(CustomerOrdersView, self).configure_form(f)
|
||||
super(CustomerOrderView, self).configure_form(f)
|
||||
|
||||
# id
|
||||
f.set_readonly('id')
|
||||
|
@ -476,6 +476,9 @@ class CustomerOrdersView(MasterView):
|
|||
|
||||
return {'ok': True, 'next_url': next_url}
|
||||
|
||||
# TODO: deprecate / remove this
|
||||
CustomerOrdersView = CustomerOrderView
|
||||
|
||||
|
||||
def includeme(config):
|
||||
CustomerOrdersView.defaults(config)
|
||||
CustomerOrderView.defaults(config)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue