Refactors triggering checked/recorded
* refactors BaseForm request/user initialization * introduces mark_as_edited() method for compensation models
This commit is contained in:
@@ -18,6 +18,7 @@ from compensation.models import Compensation, EcoAccount
|
||||
from intervention.inputs import GenerateInput
|
||||
from intervention.models import Intervention, Responsibility, Legal
|
||||
from konova.forms import BaseForm, SimpleGeomForm
|
||||
from konova.utils.message_templates import EDITED_GENERAL_DATA
|
||||
from user.models import UserActionLogEntry
|
||||
|
||||
|
||||
@@ -285,7 +286,7 @@ class EditCompensationForm(NewCompensationForm):
|
||||
|
||||
self.instance.log.add(action)
|
||||
|
||||
intervention.mark_as_edited(user)
|
||||
intervention.mark_as_edited(user, self.request, EDITED_GENERAL_DATA)
|
||||
return self.instance
|
||||
|
||||
|
||||
|
||||
@@ -19,7 +19,8 @@ from compensation.models import CompensationDocument, EcoAccountDocument
|
||||
from konova.contexts import BaseContext
|
||||
from konova.forms import BaseModalForm, NewDocumentForm
|
||||
from konova.models import DeadlineType
|
||||
from konova.utils.message_templates import FORM_INVALID
|
||||
from konova.utils.message_templates import FORM_INVALID, ADDED_COMPENSATION_STATE, ADDED_DEADLINE, \
|
||||
ADDED_COMPENSATION_ACTION
|
||||
|
||||
|
||||
class NewPaymentForm(BaseModalForm):
|
||||
@@ -98,6 +99,7 @@ class NewPaymentForm(BaseModalForm):
|
||||
|
||||
def save(self):
|
||||
pay = self.instance.add_payment(self)
|
||||
self.instance.mark_as_edited(self.user, self.request)
|
||||
return pay
|
||||
|
||||
|
||||
@@ -147,6 +149,7 @@ class NewStateModalForm(BaseModalForm):
|
||||
|
||||
def save(self, is_before_state: bool = False):
|
||||
state = self.instance.add_state(self, is_before_state)
|
||||
self.instance.mark_as_edited(self.user, self.request, ADDED_COMPENSATION_STATE)
|
||||
return state
|
||||
|
||||
def process_request(self, request: HttpRequest, msg_success: str = _("Object removed"), msg_error: str = FORM_INVALID, redirect_url: str = None):
|
||||
@@ -249,7 +252,8 @@ class NewDeadlineModalForm(BaseModalForm):
|
||||
self.form_caption = _("Insert data for the new deadline")
|
||||
|
||||
def save(self):
|
||||
deadline = self.instance.add_new_deadline(self)
|
||||
deadline = self.instance.add_deadline(self)
|
||||
self.instance.mark_as_edited(self.user, self.request, ADDED_DEADLINE)
|
||||
return deadline
|
||||
|
||||
|
||||
@@ -325,7 +329,8 @@ class NewActionModalForm(BaseModalForm):
|
||||
self.form_caption = _("Insert data for the new action")
|
||||
|
||||
def save(self):
|
||||
action = self.instance.add_new_action(self)
|
||||
action = self.instance.add_action(self)
|
||||
self.instance.mark_as_edited(self.user, self.request, ADDED_COMPENSATION_ACTION)
|
||||
return action
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user