summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-09-27 12:22:00 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-09-27 12:22:00 +0200
commitefc2b79fc849fde9f48563143463d7dd5a28307f (patch)
tree653c3173961c4a6f568198feaccfebadd37aad18
parent13ff98917de1216525b7fe51b90b6cbb0343eed2 (diff)
downloadIshtar-efc2b79fc849fde9f48563143463d7dd5a28307f.tar.bz2
Ishtar-efc2b79fc849fde9f48563143463d7dd5a28307f.zip
Admin - CSV import: ignore non relevant columns
-rw-r--r--ishtar_common/admin.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index dfe2becb3..dcf8e7b0a 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -35,7 +35,8 @@ from django.contrib.sites.models import Site
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
+from django.db.models.fields import BooleanField, IntegerField, FloatField, \
+ FieldDoesNotExist
from django.db.models.fields.related import ForeignKey
from django.forms import BaseInlineFormSet
from django.http import HttpResponseRedirect, HttpResponse
@@ -302,7 +303,10 @@ class ImportActionAdmin(admin.ModelAdmin):
value = row[k]
if value == 'None':
value = ''
- field = self.model._meta.get_field(k)
+ try:
+ field = self.model._meta.get_field(k)
+ except FieldDoesNotExist:
+ continue
if isinstance(field, IntegerField):
if not value:
value = None