aboutsummaryrefslogtreecommitdiffstats
path: root/servo
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2015-10-26 22:43:58 +0200
committerFilipp Lepalaan <filipp@mac.com>2015-10-26 22:43:58 +0200
commitd6058ee73317a26b2f41e3ecf83fdda2978382cb (patch)
tree7a10957a263e985774ae1e5884c30cc89ff9fc3e /servo
parent17406512220c08fbe6e2bce74fe75dcee7db218a (diff)
downloadServo-d6058ee73317a26b2f41e3ecf83fdda2978382cb.tar.gz
Servo-d6058ee73317a26b2f41e3ecf83fdda2978382cb.tar.bz2
Servo-d6058ee73317a26b2f41e3ecf83fdda2978382cb.zip
Show default status description if not started
Diffstat (limited to 'servo')
-rw-r--r--servo/templates/checkin/status-show.html2
-rw-r--r--servo/views/checkin.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/servo/templates/checkin/status-show.html b/servo/templates/checkin/status-show.html
index fcd503c..50d50c4 100644
--- a/servo/templates/checkin/status-show.html
+++ b/servo/templates/checkin/status-show.html
@@ -6,7 +6,7 @@
{% block main %}
<div class="page-header">
<h2>{{ order.status_name }} {{ order.status_started_at|naturaltime|default:"" }}</h2>
- <p class="lead">{{ order.status.status.description }}</p>
+ <p class="lead">{{ status_description }}</p>
</div>
{% if timeline|length %}
<ul class="timeline">
diff --git a/servo/views/checkin.py b/servo/views/checkin.py
index d48c907..a92d25b 100644
--- a/servo/views/checkin.py
+++ b/servo/views/checkin.py
@@ -190,6 +190,9 @@ def status(request):
timeline = order.orderstatus_set.all()
if order.status is None:
order.status_name = _(u'Waiting to be processed')
+ status_description = _('Order is waiting to be processed')
+ else:
+ status_description = order.status.status.description
except Order.DoesNotExist:
messages.error(request, _(u'Order %s not found') % code)
return render(request, "checkin/status-show.html", locals())