diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/data_importer.py | 5 | ||||
| -rw-r--r-- | ishtar_common/models.py | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index b5fc9b0c6..27714458b 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -437,7 +437,7 @@ class Importer(object): u"and encoding are similar to the ones used by the reference " u"file."), 'too_many_cols':_(u"Too many cols (%(user_col)d) when " - u"maximum is %(ref_col)d"), + u"maximum is %(ref_col)d"), 'no_data':_(u"No data provided"), 'value_required':_(u"Value is required"), 'not_enough_cols':_(u"At least %d columns must be filled"), @@ -794,6 +794,8 @@ class Importer(object): model = field_object.rel.to elif hasattr(field_object, 'to'): model = field_object.to + elif hasattr(field_object, 'model'): + model = field_object.model if type(many_values) not in (list, tuple): many_values = [many_values] for val in many_values: @@ -808,6 +810,7 @@ class Importer(object): for key in val.keys(): if type(val[key]) not in (list, tuple): default_dict[key] = val[key] + vals.append(default_dict.copy()) ## manage multiple values for key in val.keys(): if type(val[key]) in (list, tuple): diff --git a/ishtar_common/models.py b/ishtar_common/models.py index a57e814f0..9f7261010 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -40,6 +40,7 @@ from django.core.validators import validate_slug from django.core.urlresolvers import reverse, NoReverseMatch from django.db.utils import DatabaseError from django.db.models import Q, Max, Count +from django.db.models.base import ModelBase from django.db.models.signals import post_save, pre_delete from django.utils.translation import ugettext_lazy as _, ugettext from django.utils.safestring import SafeUnicode, mark_safe @@ -993,6 +994,8 @@ def get_model_fields(model): options = model._meta for field in sorted(options.fields + options.many_to_many): fields[field.name] = field + if hasattr(model, 'get_extra_fields'): + fields.update(model.get_extra_fields()) return fields def import_class(full_path_classname): @@ -1075,6 +1078,8 @@ def get_associated_model(parent_model, keys): field = get_model_fields(OBJECT_CLS)[item] if hasattr(field, 'rel') and hasattr(field.rel, 'to'): model = field.rel.to + if type(field) == ModelBase: + model = field else: return get_associated_model(model, keys[1:]) return model @@ -1259,6 +1264,9 @@ TARGET_MODELS = [ ('archaeological_operations.models.OperationType', _(u"Operation type")), ('archaeological_operations.models.Period', _(u"Period")), ('archaeological_context_records.models.Unit', _(u"Unit")), + ('archaeological_finds.models.MaterialType', _(u"Material")), + ('archaeological_finds.models.ConservatoryState', _(u"Conservatory state")), + ('archaeological_finds.models.PreservationType', _(u"Preservation type")), ] TARGET_MODELS_KEYS = [tm[0] for tm in TARGET_MODELS] |