diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-19 01:08:51 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-19 01:08:51 +0100 |
commit | ded35ffba989c28d8dd515fc9c0f4e241038d668 (patch) | |
tree | e756e63c9dca53bdf0f23e68a367a16b927ab61b /chimere/utils.py | |
parent | 5db6ae2fc14ebbec4b52151c7250ca0bba98bc02 (diff) | |
parent | 7d8c3719bb2dfaa70b1d6c5e2a19c53588091d3b (diff) | |
download | Chimère-ded35ffba989c28d8dd515fc9c0f4e241038d668.tar.bz2 Chimère-ded35ffba989c28d8dd515fc9c0f4e241038d668.zip |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/models.py
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/tests.py
Diffstat (limited to 'chimere/utils.py')
-rw-r--r-- | chimere/utils.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chimere/utils.py b/chimere/utils.py index ad26db2..42f3b06 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -106,6 +106,9 @@ class ImportManager: values.update({ 'import_source':self.importer_instance.source}) values['status'] = 'I' + if not self.importer_instance.associate_marker_to_way\ + and cls.__name__ == 'Route': + values['has_associated_marker'] = False try: item = cls.objects.create(**values) except TypeError: |