Compare commits

..

No commits in common. "63ff4b372bc10597f54f8e85b717c7a95e98e515" and "4b20802a6a54109eadd6341ddeaedfb3bfff614b" have entirely different histories.

4 changed files with 2 additions and 10 deletions

View File

@ -372,6 +372,7 @@ class EditInterventionForm(NewInterventionForm):
geometry = geom_form.save(user_action)
self.instance.geometry = geometry
self.instance.geometry.save()
self.instance.log.add(user_action)

View File

@ -14,7 +14,6 @@ from django.utils import timezone
from konova.models import BaseResource, UuidModel
from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
from konova.tasks import celery_check_for_geometry_conflicts
from konova.utils.wfs.spatial import ParcelWFSFetcher
@ -29,7 +28,7 @@ class Geometry(BaseResource):
def save(self, *args, **kwargs):
super().save(*args, **kwargs)
celery_check_for_geometry_conflicts.delay(self.id)
self.check_for_conflicts()
def check_for_conflicts(self):
""" Checks for new geometry overlaps

View File

@ -120,10 +120,3 @@ def celery_send_mail_deduction_changed(obj_identifier, obj_title=None, user_id=N
from user.models import User
user = User.objects.get(id=user_id)
user.send_mail_deduction_changed(obj_identifier, obj_title, data_changes)
@shared_task
def celery_check_for_geometry_conflicts(geom_id):
from konova.models import Geometry
geometry = Geometry.objects.get(id=geom_id)
geometry.check_for_conflicts()

View File

@ -47,7 +47,6 @@ class GeometryTestCase(BaseTestCase):
Returns:
"""
self.geom_2.check_for_conflicts()
conflict = GeometryConflict.objects.all()
self.assertEqual(1, conflict.count())
conflict = conflict.first()