From 25bb3b1502b18b3d90620674085f8ec03fa4c1f9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Jun 2015 11:15:54 +0100 Subject: [PATCH] Use chevron control for row linking, rather than hyperlinking first item --- rest_framework/renderers.py | 2 -- rest_framework/templates/rest_framework/admin/list.html | 6 +++--- rest_framework/templatetags/rest_framework.py | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e270c25c2..8d4a73564 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -730,12 +730,10 @@ class AdminRenderer(BrowsableAPIRenderer): columns = [key for key in header.keys() if key != 'url'] details = [key for key in header.keys() if key != 'url'] - linked = [columns[0]] if columns else [] context['style'] = style context['columns'] = columns context['details'] = details - context['linked'] = linked context['results'] = results return context diff --git a/rest_framework/templates/rest_framework/admin/list.html b/rest_framework/templates/rest_framework/admin/list.html index e8c547a6c..a3ec21af3 100644 --- a/rest_framework/templates/rest_framework/admin/list.html +++ b/rest_framework/templates/rest_framework/admin/list.html @@ -1,7 +1,7 @@ {% load rest_framework %} - {% for column in columns%}{% endfor %} + {% for column in columns%}{% endfor %} {% for row in results %} @@ -9,12 +9,12 @@ {% for key, value in row.items %} {% if key in columns %} {% endif %} {% endfor %} + {% endfor %} diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index bfbf4c44c..10ad658bd 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -134,7 +134,9 @@ def format_value(value): @register.filter def add_nested_class(value): - if isinstance(value, (list, dict)): + if isinstance(value, dict): + return 'class=nested' + if isinstance(value, list) and any([isinstance(item, (list, dict)) for item in value]): return 'class=nested' return ''
{{ column|capfirst }}
{{ column|capfirst }}
- {% if key in linked %}{% endif %} {{ value|format_value }} - {% if key in linked %}{% endif %} +