From cf26454bd34497038c9da12a9b1ad4a4dd6a39ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20A=2E=20S=C3=A1nchez=20L=C3=B3pez?= Date: Sun, 10 Oct 2010 20:20:30 +0000 Subject: [PATCH] Show reverse liaison reference in liaison detail. Fixes #387 - Legacy-Id: 2550 --- ietf/liaisons/views.py | 5 ++++- ietf/templates/liaisons/liaisondetail_detail.html | 10 ++++++++++ ietf/templates/liaisons/liaisondetail_simple_list.html | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ietf/liaisons/views.py b/ietf/liaisons/views.py index 3bf424ac2..94e963912 100644 --- a/ietf/liaisons/views.py +++ b/ietf/liaisons/views.py @@ -204,7 +204,8 @@ def _find_person_in_emails(liaison, person): def liaison_detail(request, object_id): - public_liaisons = LiaisonDetail.objects.filter(Q(approval__isnull=True)|Q(approval__approved=True)).order_by("-submitted_date") + qfilter = Q(approval__isnull=True)|Q(approval__approved=True) + public_liaisons = LiaisonDetail.objects.filter(qfilter).order_by("-submitted_date") liaison = get_object_or_404(public_liaisons, pk=object_id) can_edit = False user = request.user @@ -215,10 +216,12 @@ def liaison_detail(request, object_id): liaison.taken_care = True liaison.save() can_take_care = False + relations = liaison.liaisondetail_set.filter(qfilter) return object_detail(request, public_liaisons, object_id=object_id, extra_context = {'can_edit': can_edit, + 'relations': relations, 'can_take_care': can_take_care} ) diff --git a/ietf/templates/liaisons/liaisondetail_detail.html b/ietf/templates/liaisons/liaisondetail_detail.html index 361e76e5a..f529b7da0 100644 --- a/ietf/templates/liaisons/liaisondetail_detail.html +++ b/ietf/templates/liaisons/liaisondetail_detail.html @@ -68,6 +68,16 @@ {% endif %} +{% if relations %} + +Liaisons referring to this one: + +{% for liaison in relations %} +{% if liaison.title %}{{ object.title }}{% else %}Liaison #{{ liaison.pk }}{% endif %}
+{% endfor %} + +{% endif %} + {% if object.related_to %} Referenced liaison: diff --git a/ietf/templates/liaisons/liaisondetail_simple_list.html b/ietf/templates/liaisons/liaisondetail_simple_list.html index f08281eeb..41fd04e46 100644 --- a/ietf/templates/liaisons/liaisondetail_simple_list.html +++ b/ietf/templates/liaisons/liaisondetail_simple_list.html @@ -43,6 +43,7 @@ {% else %} {{ liaison.title|escape }} {% endif %} + {% endfor %}