diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-01 11:15:38 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-02-01 11:15:38 +0100 |
commit | 3ed4053789908b13829c28e981e026460b285d9c (patch) | |
tree | b5d6a0afb5f2f759404d470d2b83601963f02d7a /chimere/utils.py | |
parent | aac22ae3b072b4b40962b5e776e403431e3886db (diff) | |
download | Chimère-3ed4053789908b13829c28e981e026460b285d9c.tar.bz2 Chimère-3ed4053789908b13829c28e981e026460b285d9c.zip |
Imports: prevent overload of descriptions.
Diffstat (limited to 'chimere/utils.py')
-rw-r--r-- | chimere/utils.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chimere/utils.py b/chimere/utils.py index c7126f9..d1ea851 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -76,11 +76,9 @@ class ImportManager(object): import_key = unicode(import_key).replace(':', '^') if not values.get('name'): values['name'] = self.default_name - if not self.importer_instance.get_description and \ - self.importer_instance.default_description: - values['description'] = self.importer_instance.default_description if not key: key = self.importer_instance.importer_type + item = None if import_key or pk: dct_import = { 'import_key__icontains':'%s:%s;' % (key, import_key), @@ -102,7 +100,8 @@ class ImportManager(object): else: item = ref_item for k in values: - setattr(item, k, values[k]) + if values[k]: + setattr(item, k, values[k]) try: item.save() # force the modified_since_import status @@ -115,6 +114,10 @@ class ImportManager(object): except ObjectDoesNotExist: pass if not item: + if not self.importer_instance.get_description and \ + self.importer_instance.default_description: + values['description'] = \ + self.importer_instance.default_description values.update({ 'import_source':self.importer_instance.source}) values['status'] = 'I' |