From 1e9b1c8b9fdace4e4335bffec311d486c30afe34 Mon Sep 17 00:00:00 2001 From: Ciro Scognamiglio Date: Mon, 3 Mar 2014 16:09:00 +0100 Subject: [PATCH] each table element is identified by a key --- rest/__init__.py | 2 -- rest/templates/table-default.html | 4 ++-- rest/templatetags/rest_filters.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/rest/__init__.py b/rest/__init__.py index c21c5ec9..2638b8ef 100644 --- a/rest/__init__.py +++ b/rest/__init__.py @@ -41,12 +41,10 @@ class ObjectRequest(object): self.filters['platform'] = '!myslice' else : self.setKey() - self.setLocalFields() def setKey(self): - print self.type # What about key formed of multiple fields??? query = Query.get('local:object').filter_by('table', '==', self.type).select('key') results = execute_query(self.request, query) diff --git a/rest/templates/table-default.html b/rest/templates/table-default.html index d8397ce1..71ae0837 100644 --- a/rest/templates/table-default.html +++ b/rest/templates/table-default.html @@ -7,8 +7,8 @@ {% for d in data %} - - {% if "checkbox" in options %}{% endif %} + + {% if "checkbox" in options %}{% endif %} {% for f in fields %}
{{ d|key:f }}
{% endfor %} {% endfor %} diff --git a/rest/templatetags/rest_filters.py b/rest/templatetags/rest_filters.py index bc68393b..35dbc274 100644 --- a/rest/templatetags/rest_filters.py +++ b/rest/templatetags/rest_filters.py @@ -4,7 +4,7 @@ register = template.Library() @register.filter(name='key') def key(d, key_name): - if d[key_name] != None : + if key_name in d and d[key_name] != None : return d[key_name] else : return "" -- 2.43.0