each table element is identified by a key

diff --git a/rest/__init__.py b/rest/__init__.py
index c21c5ec..2638b8e 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -41,12 +41,10 @@ class ObjectRequest(object):
             self.filters['platform'] = '!myslice'
         else :
             self.setKey()
             self.filters['platform'] = '!myslice'
         else :
             self.setKey()

-        

             self.setLocalFields()
         
     
     def setKey(self):
             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)
         # 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 d8397ce..71ae083 100644 (file)
--- a/rest/templates/table-default.html
+++ b/rest/templates/table-default.html
@@ -7,8 +7,8 @@
 </thead>
 <tbody>
 {% for d in data %}
 </thead>
 <tbody>
 {% for d in data %}

-<tr id="{{ id }}">
-       {% if "checkbox" in options %}<td><input type="checkbox" name="{{ id }}" /></td>{% endif %}
+<tr id="{{ d|key:id }}">
+       {% if "checkbox" in options %}<td><input type="checkbox" name="{{ id }}" value="{{ d|key:id }}" /></td>{% endif %}

        {% for f in fields %}<td><div class="line1">{{ d|key:f }}</div></td>{% endfor %}
 </tr>
 {% endfor %}
        {% for f in fields %}<td><div class="line1">{{ d|key:f }}</div></td>{% endfor %}
 </tr>
 {% endfor %}

diff --git a/rest/templatetags/rest_filters.py b/rest/templatetags/rest_filters.py
index bc68393..35dbc27 100644 (file)
--- 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):
 
 @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 ""
         return d[key_name]
     else :
         return ""