Admin - CSV import: ignore non relevant columns - 3

1 files changed, 6 insertions, 1 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index db93362d9..a3eb39104 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -36,7 +36,7 @@ from django.contrib.gis.forms import PointField, OSMWidget, MultiPolygonField
 from django.core.cache import cache
 from django.core.urlresolvers import reverse
 from django.db.models.fields import BooleanField, IntegerField, FloatField, \
-    FieldDoesNotExist
+    CharField, FieldDoesNotExist
 from django.db.models.fields.related import ForeignKey
 from django.forms import BaseInlineFormSet
 from django.http import HttpResponseRedirect, HttpResponse
@@ -308,6 +308,11 @@ class ImportActionAdmin(admin.ModelAdmin):
                         except FieldDoesNotExist:
                             row.pop(k)
                             continue
+                        if isinstance(field, CharField):
+                            if not value:
+                                value = u""
+                            else:
+                                value = value.decode('utf-8')
                         if isinstance(field, IntegerField):
                             if not value:
                                 value = None