Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Don't crash when no user name

Browse source
This commit is contained in:
Midgard 2020-08-19 13:02:14 +02:00
parent 1bea3d2fcc
commit f516ffe8c6
Signed by: midgard
GPG key ID: 511C112F1331BBB4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/order.py
View file

@ -67,7 +67,7 @@ class Order(db.Model):
for _user_name, order_items in group.items(): for _user_name, order_items in group.items():
order_items.sort(key=lambda order_item: order_item.comment or "") order_items.sort(key=lambda order_item: order_item.comment or "")
return list(sorted(group.items())) return list(sorted(group.items(), key=lambda t: (t[0] or "", t[1] or "")))
def group_by_dish(self) -> typing.List[typing.Tuple[str, typing.List]]: def group_by_dish(self) -> typing.List[typing.Tuple[str, typing.List]]:
"Group items of an Order by dish" "Group items of an Order by dish"
@ -82,7 +82,7 @@ class Order(db.Model):
for _dish_name, order_items in group.items(): for _dish_name, order_items in group.items():
order_items.sort(key=lambda order_item: ( order_items.sort(key=lambda order_item: (
(order_item.comment or " No comment") + (order_item.comment or " No comment") +
(order_item.for_name) (order_item.for_name or "")
)) ))
return list(sorted(group.items())) return list(sorted(group.items()))