* extends KonovaCode filtering for parent objects matching given input
* renames data_form into form for easier template render support
* simplifies empty geometry form initialization
This commit is contained in:
mipel
2021-09-29 14:49:17 +02:00
parent 49a9d03471
commit 7841599650
7 changed files with 26 additions and 26 deletions

View File

@@ -12,6 +12,5 @@
{% endblock %}
{% block body %}
<h2>{{data_form.form_title}}</h2>
{% include 'form/main_data_collapse_form.html' %}
{% endblock %}

View File

@@ -13,7 +13,7 @@ from konova.decorators import *
from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm, RecordModalForm
from konova.sub_settings.django_settings import DEFAULT_DATE_FORMAT
from konova.utils.documents import remove_document, get_document
from konova.utils.message_templates import INTERVENTION_INVALID
from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID
from konova.utils.user_checks import in_group
@@ -76,12 +76,12 @@ def new_view(request: HttpRequest):
messages.success(request, _("Intervention {} added").format(intervention.identifier))
return redirect("intervention:index")
else:
messages.error(request, _("Invalid input"))
messages.error(request, FORM_INVALID)
else:
# For clarification: nothing in this case
pass
context = {
"data_form": data_form,
"form": data_form,
"geom_form": geom_form,
"url": reverse("intervention:new-id")
}
@@ -255,12 +255,12 @@ def edit_view(request: HttpRequest, id: str):
messages.success(request, _("Intervention {} edited").format(intervention.identifier))
return redirect("intervention:open", id=intervention.id)
else:
messages.error(request, _("Invalid input"))
messages.error(request, FORM_INVALID)
else:
# For clarification: nothing in this case
pass
context = {
"data_form": data_form,
"form": data_form,
"geom_form": geom_form,
}
context = BaseContext(request, context).context