Compensation enhancements

* compensations won't be listed in index table if related intervention has been deleted
* adds functionality for intervention remove button
* adds outcommented code
* adds configurable redirect_url for RemoveModalForm's process_request method
* adds translation
This commit is contained in:
mipel
2021-08-02 15:39:33 +02:00
parent d203046666
commit 63b2d3ef66
8 changed files with 17 additions and 34 deletions

View File

@@ -143,13 +143,9 @@ class Intervention(BaseObject):
)
for com in coms:
com.deleted = action
#com.deleted_on = _now
#com.deleted_by = _user
com.save()
self.deleted = action
#self.deleted_on = _now
#self.deleted_by = _user
self.save()
@staticmethod

View File

@@ -42,11 +42,9 @@
{% fa5_icon 'edit' %}
</button>
</a>
<a href="{% url 'home' %}" class="mr-2">
<button class="btn btn-default" title="{% trans 'Delete' %}">
{% fa5_icon 'trash' %}
</button>
</a>
<button class="btn btn-default btn-modal" data-form-url="{% url 'intervention:remove' intervention.id %}" title="{% trans 'Delete' %}">
{% fa5_icon 'trash' %}
</button>
{% endif %}
</div>
</div>

View File

@@ -9,7 +9,7 @@ from intervention.models import Intervention
from intervention.tables import InterventionTable
from konova.contexts import BaseContext
from konova.decorators import *
from konova.forms import RemoveForm, SimpleGeomForm, NewDocumentForm
from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm
from konova.utils.message_templates import FORM_INVALID
@@ -190,21 +190,14 @@ def remove_view(request: HttpRequest, id: str):
Returns:
"""
template = "konova/form.html"
obj = Intervention.objects.get(id=id)
# ToDo
form = RemoveForm(
object_to_remove=obj,
remove_post_url=reverse("intervention:remove", args=(id,)),
cancel_url=reverse("intervention:index"),
identifier = obj.identifier
form = RemoveModalForm(request.POST or None, instance=obj, user=request.user)
return form.process_request(
request,
_("{} removed").format(identifier),
redirect_url=reverse("intervention:index")
)
context = {
"form": form,
}
context = BaseContext(request, context).context
return render(request, template, context)
@login_required