IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

Merge pull request 'egon_sending_on_edit' (#263) from egon_sending_on_edit into master

Browse Source 
Reviewed-on: SGD-Nord/konova#263
This commit is contained in:
mpeltriaux 2022-12-05 06:09:59 +01:00
commit 821141f2a8
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/utils/serializer/v1/intervention.py
View File

@ -133,7 +133,6 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
id__in=payments id__in=payments
) )
obj.payments.set(payments) obj.payments.set(payments)
obj.send_data_to_egon()
return obj return obj
def create_model_from_json(self, json_model, user): def create_model_from_json(self, json_model, user):
@ -201,6 +200,7 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
obj.save() obj.save()
obj.mark_as_edited(user, edit_comment="API update") obj.mark_as_edited(user, edit_comment="API update")
obj.send_data_to_egon()
celery_update_parcels.delay(obj.geometry.id) celery_update_parcels.delay(obj.geometry.id)

1
intervention/forms/intervention.py
View File

@ -385,6 +385,7 @@ class EditInterventionForm(NewInterventionForm):
geometry = geom_form.save(user_action) geometry = geom_form.save(user_action)
self.instance.geometry = geometry self.instance.geometry = geometry
self.instance.save() self.instance.save()
self.instance.send_data_to_egon()
return self.instance return self.instance

2
intervention/forms/modals/document.py
View File

@ -25,8 +25,6 @@ class NewInterventionDocumentModalForm(NewDocumentModalForm):
""" """
doc = super().save(*args, **kwargs) doc = super().save(*args, **kwargs)
if self.instance.payments.exists():
self.instance.send_data_to_egon() self.instance.send_data_to_egon()
return doc return doc

2
intervention/models/intervention.py
View File

@ -145,11 +145,13 @@ class Intervention(BaseObject,
Returns: Returns:
""" """
if self.payments.exists():
celery_export_to_egon.delay(self.id) celery_export_to_egon.delay(self.id)
def set_recorded(self, user: User) -> UserActionLogEntry: def set_recorded(self, user: User) -> UserActionLogEntry:
log_entry = super().set_recorded(user) log_entry = super().set_recorded(user)
self.add_log_entry_to_compensations(log_entry) self.add_log_entry_to_compensations(log_entry)
self.send_data_to_egon()
return log_entry return log_entry
def add_log_entry_to_compensations(self, log_entry: UserActionLogEntry): def add_log_entry_to_compensations(self, log_entry: UserActionLogEntry):