From 7cc362668e25de2b7d3d80fa132d6d6a74306186 Mon Sep 17 00:00:00 2001 From: artus40 Date: Thu, 29 Dec 2016 15:20:16 +0100 Subject: [PATCH] resolved #20, modified layout on 'suivi:details' --- notes/templates/notes/table_inline.html | 6 +++++- notes/templatetags/notes.py | 8 +++++++- suivi/templates/suivi/details.html | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/notes/templates/notes/table_inline.html b/notes/templates/notes/table_inline.html index 9b9ecbd..be289c3 100644 --- a/notes/templates/notes/table_inline.html +++ b/notes/templates/notes/table_inline.html @@ -1,6 +1,10 @@ - {{header}} {{small}} + {% if link %} + {{header}} + {% else %} + {{header}} + {% endif %} {{small}} {% for label in labels %} {{label}} diff --git a/notes/templatetags/notes.py b/notes/templatetags/notes.py index 96fbfed..5c09b29 100644 --- a/notes/templatetags/notes.py +++ b/notes/templatetags/notes.py @@ -1,4 +1,5 @@ from django import template +from django.urls import reverse register = template.Library() @@ -13,11 +14,16 @@ def inline_table(note, header=None): if header == "date": header_field = "created_date" + link = None elif header == "sujet": header_field = "sujet" + link = reverse("suivi:details", kwargs={'pk': note.sujet.pk}) + + header = getattr(note, header_field) return { - 'header': getattr(note, header_field), + 'header': header, + 'link': link, 'small': note.child_class.__qualname__, 'bg_color': bg_color or "default", 'bg_label_color': bg_label_color or "info", diff --git a/suivi/templates/suivi/details.html b/suivi/templates/suivi/details.html index 3e9472f..c3576f2 100644 --- a/suivi/templates/suivi/details.html +++ b/suivi/templates/suivi/details.html @@ -1,5 +1,5 @@ {% load bootstrap3 %} -
+
{% include "suivi/sujet_suivi.html" %}
@@ -23,4 +23,4 @@
-
{% include "sujets/sujet_details.html" %}
+
{% include "sujets/sujet_details.html" %}