Merge branch 'stable'

Conflicts:
	ishtar_common/data_importer.py

1 files changed, 16 insertions, 5 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 89e56a312..2174b1edb 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -988,6 +988,10 @@ MODELS = [
 if 'archaeological_files' in settings.INSTALLED_APPS:
     MODELS = [('archaeological_files.models.File', _(u"Archaeological files")),
              ] + MODELS
+if 'archaeological_context_records' in settings.INSTALLED_APPS:
+    MODELS = [('archaeological_context_records.models.ContextRecord',
+              _(u"Archaeological files")),
+             ] + MODELS
 
 def get_model_fields(model):
     """
@@ -1068,15 +1072,21 @@ class ImporterType(models.Model):
         return newclass
 
 def get_associated_model(parent_model, keys):
-    field = None
-    OBJECT_CLS = import_class(parent_model)
+    model = None
+    OBJECT_CLS = None
+    if isinstance(parent_model, unicode) or \
+       isinstance(parent_model, str):
+        OBJECT_CLS = import_class(parent_model)
+    else:
+        OBJECT_CLS = parent_model
     for idx, item in enumerate(keys):
         if not idx:
             field = get_model_fields(OBJECT_CLS)[item]
+            if hasattr(field, 'rel') and hasattr(field.rel, 'to'):
+                model = field.rel.to
         else:
-            raise NotImplemented()
-    if hasattr(field, 'rel') and hasattr(field.rel, 'to'):
-        return field.rel.to
+            return get_associated_model(model, keys[1:])
+    return model
 
 class ImporterDefault(models.Model):
     """
@@ -1240,6 +1250,7 @@ class TargetKey(models.Model):
             if v:
                 v.add_key(self.key)
         return obj
+
 TARGET_MODELS = [
     ('OrganizationType', _(u"Organization type")),
     ('SourceType', _(u"Source type")),