From 8c2af1fc67efe1b9b24c2fea718c859d31835ba2 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 20 Apr 2015 00:03:40 +0100 Subject: [PATCH 1/2] Rig numbers for all invoice lists now link to event_detail page - issue #65 --- RIGS/templates/RIGS/event_invoice.html | 2 +- RIGS/templates/RIGS/invoice_list.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html index c3b42807..2a460f41 100644 --- a/RIGS/templates/RIGS/event_invoice.html +++ b/RIGS/templates/RIGS/event_invoice.html @@ -37,7 +37,7 @@ danger {% endif %} "> - N{{ object.pk|stringformat:"05d" }} + N{{ object.pk|stringformat:"05d" }} {{ object.end_date }} {{ object.name }} diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html index 9db8feb7..2bb7d271 100644 --- a/RIGS/templates/RIGS/invoice_list.html +++ b/RIGS/templates/RIGS/invoice_list.html @@ -24,8 +24,8 @@ {% for object in object_list %} - {{ object.pk }} - {{ object.event }} + {{ object.pk }} + N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} {{ object.invoice_date }} {{ object.balance|floatformat:2 }} From 954c5b9119d61f5dda153a10757ecb0ce86a3891 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 21 Apr 2015 19:43:32 +0100 Subject: [PATCH 2/2] Rig links open in _blank --- RIGS/templates/RIGS/event_invoice.html | 2 +- RIGS/templates/RIGS/invoice_list.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html index 2a460f41..570243ce 100644 --- a/RIGS/templates/RIGS/event_invoice.html +++ b/RIGS/templates/RIGS/event_invoice.html @@ -37,7 +37,7 @@ danger {% endif %} "> - N{{ object.pk|stringformat:"05d" }} + N{{ object.pk|stringformat:"05d" }} {{ object.end_date }} {{ object.name }} diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html index 2bb7d271..bf9fe31f 100644 --- a/RIGS/templates/RIGS/invoice_list.html +++ b/RIGS/templates/RIGS/invoice_list.html @@ -25,7 +25,7 @@ {% for object in object_list %} {{ object.pk }} - N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} + N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} {{ object.invoice_date }} {{ object.balance|floatformat:2 }}