Compare commits

..

No commits in common. "cd914c880fd75e5c42d482b3004a8a042e0f238b" and "71811ae156ccfb39188d2f10cdd8c0b7d37ca1a3" have entirely different histories.

View File

@ -698,16 +698,18 @@ class GeoReferencedMixin(models.Model):
return request return request
instance_objs = [] instance_objs = []
add_message = False
conflicts = self.geometry.conflicts_geometries.all() conflicts = self.geometry.conflicts_geometries.all()
for conflict in conflicts: for conflict in conflicts:
instance_objs += conflict.affected_geometry.get_data_objects() instance_objs += conflict.affected_geometry.get_data_objects()
add_message = True
conflicts = self.geometry.conflicted_by_geometries.all() conflicts = self.geometry.conflicted_by_geometries.all()
for conflict in conflicts: for conflict in conflicts:
instance_objs += conflict.conflicting_geometry.get_data_objects() instance_objs += conflict.conflicting_geometry.get_data_objects()
add_message = True
add_message = len(instance_objs) > 0
if add_message: if add_message:
instance_identifiers = [x.identifier for x in instance_objs] instance_identifiers = [x.identifier for x in instance_objs]
instance_identifiers = ", ".join(instance_identifiers) instance_identifiers = ", ".join(instance_identifiers)