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

Add UI support for Product.deleted column.

Browse source 
This leverages the 'products.view_deleted' permission to hide products
which are marked as deleted from various views.  Also adds a 'deleted'
class to product grid rows where the flag is set, and adds a flash warning
when viewing a deleted product.
This commit is contained in:
Lance Edgar 2015-02-11 00:52:23 -06:00
parent 6434e64f5e
commit f3d449c9f3
2 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

47
tailbone/views/products.py
View file

@ -184,6 +184,8 @@ class ProductsGrid(SearchableAlchemyGridView):
def query(self):
q = self.make_query()
if not self.request.has_perm('products.view_deleted'):
q = q.filter(model.Product.deleted == False)
q = q.options(joinedload(Product.brand))
q = q.options(joinedload(Product.department))
q = q.options(joinedload(Product.subdepartment))
@ -194,7 +196,12 @@ class ProductsGrid(SearchableAlchemyGridView):
def grid(self):
def extra_row_class(row, i):
return 'not-for-sale' if row.not_for_sale else None
cls = []
if row.not_for_sale:
cls.append('not-for-sale')
if row.deleted:
cls.append('deleted')
return ' '.join(cls) if cls else None
g = self.make_grid(extra_row_class=extra_row_class)
g.upc.set(renderer=GPCFieldRenderer)
g.regular_price.set(renderer=PriceFieldRenderer)
@ -278,12 +285,20 @@ class ProductCrud(CrudView):
fs.regular_price,
fs.current_price,
fs.not_for_sale,
fs.deleted,
])
if not self.readonly:
del fs.regular_price
del fs.current_price
return fs
def pre_crud(self, product):
self.product_deleted = not self.creating and product.deleted
def post_crud(self, product, form):
if self.product_deleted:
self.request.session.flash("This product is marked as deleted.", 'error')
def template_kwargs(self, form):
kwargs = super(ProductCrud, self).template_kwargs(form)
kwargs['image'] = False
@ -310,6 +325,25 @@ class ProductVersionView(VersionView):
(model.ProductPrice, 'product_uuid'),
]
def warn_if_deleted(self):
"""
Maybe set flash warning if product is marked deleted.
"""
uuid = self.request.matchdict['uuid']
product = Session.query(model.Product).get(uuid)
assert product, "No product found for UUID: {0}".format(repr(uuid))
if product.deleted:
self.request.session.flash("This product is marked as deleted.", 'error')
def list(self):
self.warn_if_deleted()
return super(ProductVersionView, self).list()
def details(self):
self.warn_if_deleted()
return super(ProductVersionView, self).details()
def products_search(request):
"""
@ -328,10 +362,13 @@ def products_search(request):
upc = GPC(upc, calc_check_digit='upc')
product = get_product_by_upc(Session, upc)
if product:
product = {
'uuid': product.uuid,
'full_description': product.full_description,
}
if product.deleted and not request.has_perm('products.view_deleted'):
product = None
else:
product = {
'uuid': product.uuid,
'full_description': product.full_description,
}
return {'product': product}