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

Merge pull request #152 from ZeusWPI/hotfix

Browse source 
Fix order_... renaming
This commit is contained in:
Maxime 2019-10-24 14:15:50 +02:00 committed by GitHub
commit 9b1ae9069e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/notification.py
View file

@ -18,7 +18,7 @@ def webhook_text(order_item: Order) -> typing.Optional[str]:
if order_item.courrier is not None: if order_item.courrier is not None:
# pylint: disable=C0301 # pylint: disable=C0301
return "<!channel|@channel> {3} is going to {1}, order <{0}|here>! Deadline in {2} minutes!".format( return "<!channel|@channel> {3} is going to {1}, order <{0}|here>! Deadline in {2} minutes!".format(
url_for("order_bp.order", id=order_item.id, _external=True), url_for("order_bp.order_from_id", order_id=order_item.id, _external=True),
order_item.location.name, order_item.location.name,
remaining_minutes(order_item.stoptime), remaining_minutes(order_item.stoptime),
order_item.courrier.username.title(), order_item.courrier.username.title(),
@ -27,7 +27,7 @@ def webhook_text(order_item: Order) -> typing.Optional[str]:
return "<!channel|@channel> New order for {}. Deadline in {} minutes. <{}|Open here.>".format( return "<!channel|@channel> New order for {}. Deadline in {} minutes. <{}|Open here.>".format(
order_item.location.name, order_item.location.name,
remaining_minutes(order_item.stoptime), remaining_minutes(order_item.stoptime),
url_for("order_bp.order", id=order_item.id, _external=True), url_for("order_bp.order_from_id", order_id=order_item.id, _external=True),
) )

2
app/templates/utils.html
View file

@ -9,7 +9,7 @@
<b>Orders:</b> {{ order.items.count() }}</p> <b>Orders:</b> {{ order.items.count() }}</p>
</div> </div>
<div class="col-md-4 col-lg-3"> <div class="col-md-4 col-lg-3">
<a class="btn btn-primary btn-block align-bottom" href="{{ url_for('order_bp.order', order_id=order.id) }}">Expand</a> <a class="btn btn-primary btn-block align-bottom" href="{{ url_for('order_bp.order_from_id', order_id=order.id) }}">Expand</a>
</div> </div>
</div> </div>
{%- endmacro %} {%- endmacro %}