Created|Deleted refactoring
* refactors base attributes created and deleted into UserActionLogEntry foreign keys * refactors all related queries and process logic * fixes binding_on into binding_date in intervention/detail/view.html * adds basic __str__ for some models *
This commit is contained in:
+35
-8
@@ -21,8 +21,10 @@ from django.utils import timezone
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from konova.contexts import BaseContext
|
||||
from konova.enums import UserActionLogEntryEnum
|
||||
from konova.models import Document
|
||||
from konova.utils.message_templates import FORM_INVALID
|
||||
from user.models import UserActionLogEntry
|
||||
|
||||
|
||||
class BaseForm(forms.Form):
|
||||
@@ -101,11 +103,26 @@ class RemoveForm(BaseForm):
|
||||
return self.cleaned_data.get("check", False)
|
||||
|
||||
def save(self, user: User):
|
||||
""" Perform generic removing by running the form typical 'save()' method
|
||||
|
||||
Args:
|
||||
user (User): The performing user
|
||||
|
||||
Returns:
|
||||
|
||||
"""
|
||||
if self.object_to_remove is not None and self.is_checked():
|
||||
self.object_to_remove.is_active = False
|
||||
self.object_to_remove.deleted_on = timezone.now()
|
||||
self.object_to_remove.deleted_by = user
|
||||
self.object_to_remove.save()
|
||||
with transaction.atomic():
|
||||
self.object_to_remove.is_active = False
|
||||
action = UserActionLogEntry.objects.create(
|
||||
user=user,
|
||||
timestamp=timezone.now(),
|
||||
action=UserActionLogEntryEnum.DELETED.value
|
||||
)
|
||||
self.object_to_remove.deleted = action
|
||||
#self.object_to_remove.deleted_on = timezone.now()
|
||||
#self.object_to_remove.deleted_by = user
|
||||
self.object_to_remove.save()
|
||||
return self.object_to_remove
|
||||
|
||||
|
||||
@@ -169,9 +186,15 @@ class RemoveModalForm(BaseModalForm):
|
||||
self.form_caption = _("Are you sure?")
|
||||
|
||||
def save(self):
|
||||
if hasattr(self.instance, "deleted_on"):
|
||||
self.instance.deleted_on = timezone.now()
|
||||
self.instance.deleted_by = self.user
|
||||
if hasattr(self.instance, "deleted"):
|
||||
action = UserActionLogEntry.objects.create(
|
||||
user=self.user,
|
||||
timestamp=timezone.now(),
|
||||
action=UserActionLogEntryEnum.DELETED.value,
|
||||
)
|
||||
self.instance.deleted = action
|
||||
#self.instance.deleted_on = timezone.now()
|
||||
#self.instance.deleted_by = self.user
|
||||
self.instance.save()
|
||||
else:
|
||||
# If the class does not provide restorable delete functionality, we must delete the entry finally
|
||||
@@ -270,8 +293,12 @@ class NewDocumentForm(BaseModalForm):
|
||||
|
||||
def save(self):
|
||||
with transaction.atomic():
|
||||
action = UserActionLogEntry.objects.create(
|
||||
user=self.user,
|
||||
action=UserActionLogEntryEnum.CREATED.value,
|
||||
)
|
||||
doc = Document.objects.create(
|
||||
created_by=self.user,
|
||||
created=action,
|
||||
title=self.cleaned_data["title"],
|
||||
comment=self.cleaned_data["comment"],
|
||||
document=self.cleaned_data["file"],
|
||||
|
||||
Reference in New Issue
Block a user