Preventive file: work on inlines - 2

1 files changed, 9 insertions, 5 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index bbd61f14b..b21503c35 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -46,6 +46,7 @@ from django.contrib.gis.geos import GEOSGeometry, MultiPolygon
 from django.contrib.gis.gdal.error import GDALException
 from django.contrib.gis.geos.error import GEOSException
 from django.core.cache import cache
+from django.core.exceptions import FieldError
 from django.core.serializers import serialize
 from django.core.urlresolvers import reverse
 from django.db.models.fields import (
@@ -575,11 +576,14 @@ class ImportActionAdmin(admin.ModelAdmin):
                         elif isinstance(field, ForeignKey):
                             if value:
                                 model = field.rel.to
-                                try:
-                                    value = model.objects.get(**{slug_col: value})
-                                except model.DoesNotExist:
-                                    missing_parent.append(row.pop(k))
-                                    continue
+                                for slug_col2 in self.import_keys:
+                                    try:
+                                        value = model.objects.get(**{slug_col2: value})
+                                    except FieldError:
+                                        continue
+                                    except model.DoesNotExist:
+                                        missing_parent.append(row.pop(k))
+                                        break
                             else:
                                 value = None
                         row[k] = value