fix items and collections fields display ordering + make item title optional for...

diff --git a/telemeta/models.py b/telemeta/models.py
index 3b9f97ec6949173d2c30244b3f01aaef8b47a163..5b9a870fd53856b87e186daca181e02e07f99967 100644 (file)
--- a/telemeta/models.py
+++ b/telemeta/models.py
@@ -32,6 +32,13 @@ class MediaCore(object):
             fields_dict[field.name] = getattr(self, field.name)
         return fields_dict
 
+    def to_list(self):  
+        "Return model fields as a list"
+        fields_list = []
+        for field in self._meta.fields:
+            fields_list.append({'name': field.name, 'value': getattr(self, field.name)})
+        return fields_list
+
     def get_dom_element_name(cls):
         clsname = cls.__name__
         return clsname[0].lower() + clsname[1:]
@@ -229,7 +236,7 @@ class MediaItem(models.Model, MediaCore):
     region_village = models.CharField(maxlength=250, blank=True)
     ethnie_grsocial = models.CharField(maxlength=250, blank=True)
     titre_support = models.CharField(maxlength=250, blank=True)
-    _title = models.CharField(maxlength=250, db_column='title')
+    _title = models.CharField(maxlength=250, db_column='title', blank=True)
     transcrip_trad = models.CharField(maxlength=250, blank=True)
     auteur = models.CharField(maxlength=250, blank=True)
     form_genr_style = models.CharField(maxlength=250, blank=True)

diff --git a/telemeta/templates/collection_detail.html b/telemeta/templates/collection_detail.html
index 461049496620bd3742120cf23f4f130bd5106d6b..91c576933ccde0e49e9a2c8491266df287cc088c 100644 (file)
--- a/telemeta/templates/collection_detail.html
+++ b/telemeta/templates/collection_detail.html
@@ -44,7 +44,7 @@
 
     <h3>Collection: {{ object.title }}</h3>
     <ul>
-    {% for field in object.to_dict|tolist %}
+    {% for field in object.to_list %}
         {% ifnotequal field.name "title" %}
 
         <li><b>{{ field.name|capfirst }}</b> : {{ field.value }}</li>

diff --git a/telemeta/templates/mediaitem_detail.html b/telemeta/templates/mediaitem_detail.html
index dd51c00298a849e675908196e7acc234035f9c8d..e3a7ccaa9a4d39f42ad6277f4f1b6e6fef92d991 100644 (file)
--- a/telemeta/templates/mediaitem_detail.html
+++ b/telemeta/templates/mediaitem_detail.html
@@ -54,7 +54,7 @@
 
   <h3>Item: {{ item.title }}</h3>
   <ul>
-  {% for field in item.to_dict|tolist %}
+  {% for field in item.to_list %}
       {% ifnotequal field.name "title" %}
       {% ifnotequal field.name "file" %}