diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-08 00:12:12 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-12-08 00:15:52 +0100 |
| commit | 8d2fb762f22d4899941b5cea2117365eb55a87d6 (patch) | |
| tree | 26ece5edb55f6f3aea316ac41d35964217fbd88e /chimere/models.py | |
| parent | af8522d68d00ff30bc188513525020f0eda3ae2d (diff) | |
| download | Chimère-8d2fb762f22d4899941b5cea2117365eb55a87d6.tar.bz2 Chimère-8d2fb762f22d4899941b5cea2117365eb55a87d6.zip | |
Imports: Manage overwrite optionaly
Diffstat (limited to 'chimere/models.py')
| -rw-r--r-- | chimere/models.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chimere/models.py b/chimere/models.py index f6b1872..50a3dc9 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -239,6 +239,7 @@ class Importer(models.Model): blank=True, null=True) srid = models.IntegerField(_(u"SRID"), blank=True, null=True) zipped = models.BooleanField(_(u"Zipped file"), default=False) + overwrite = models.BooleanField(_(u"Overwrite data"), default=False) origin = models.CharField(_(u"Origin"), max_length=100, blank=True, null=True) license = models.CharField(_(u"License"), max_length=100, @@ -520,8 +521,8 @@ class Marker(GeographicItem): PRE_ATTRS = { - 'Marker':('name', 'geometry', 'import_version'), - 'Route':('name', 'geometry', 'import_version'), + 'Marker':('name', 'geometry', 'import_version', 'modified_since_import'), + 'Route':('name', 'geometry', 'import_version', 'modified_since_import'), 'Area':('urn', 'name'), } def geometry_pre_save(cls, pre_save_geom_values): @@ -550,7 +551,11 @@ def geometry_post_save(pre_save_geom_values): or kwargs['instance'].pk not in pre_save_geom_values: return instance = kwargs['instance'] - name, geometry, import_version = pre_save_geom_values[instance.pk] + name, geometry, import_version, modified_since_import = \ + pre_save_geom_values[instance.pk] + # force the reinit of modified_since_import + if modified_since_import != instance.modified_since_import: + return if (instance.import_version != import_version and instance.modified_since_import): instance.modified_since_import = False |