Improve CSV export and import - more tolerant add of choice values

1 files changed, 4 insertions, 4 deletions

diff --git a/chimere/utils.py b/chimere/utils.py
index 75c0ad4..cdd053d 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -475,10 +475,10 @@ class CSVManager(ImportManager):
             return (0, 0, msg)
         reader = csv.reader(source, delimiter=';', quotechar='"')
         prop_cols = []
-        for pm in Marker.properties():
+        for pm in Marker.all_properties():
             prop_cols.append((pm.name, pm.getAttrName(),
                               pm.getAttrName()+'_set'))
-        cols = self.COLS + prop_cols
+        cols = list(self.COLS) + prop_cols
         datas = []
         for idx, row in enumerate(reader):
             if not idx: # first row
@@ -523,8 +523,8 @@ class CSVManager(ImportManager):
     def export(cls, queryset):
         dct = {'description':unicode(datetime.date.today()), 'data':[]}
         cls_name = queryset.model.__name__.lower()
-        cols = cls.COLS
-        for pm in queryset.model.properties():
+        cols = list(cls.COLS)
+        for pm in queryset.model.all_properties():
             cols.append((pm.name, pm.getAttrName(), pm.getAttrName()+'_set'))
         header = [col[0] for col in cols]
         dct['data'].append(header)