diff options
Diffstat (limited to 'archaeological_operations/views.py')
| -rw-r--r-- | archaeological_operations/views.py | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 5a3cf1112..c0f3ab56c 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -422,30 +422,33 @@ def operation_modify_parcels(request, pk): if request.method == 'POST': formset = formset_class(request.POST, request.FILES) print(formset.non_form_errors()) - + for form in formset: + print(form.errors) if formset.is_valid(): print(formset.non_form_errors()) print(formset.cleaned_data) post_data = [form.cleaned_data for form in formset] for data in post_data: - for key, value in data.items(): - print(str(key) + " -> " + str(value) + "\n") - if key == "DELETE" and value == True: - post_data.pop(key) + current_parcel = models.Parcel.objects.get(pk=post_data.get("pk")) - current_parcel = models.Parcel.objects.get(pk=post_data.get["pk"]) if current_parcel: - current_parcel.year = post_data.get["year"] - current_parcel.section = post_data.get["section"] - current_parcel.parcel_number = post_data.get["parcel_number"] - current_parcel.town = post_data.get["town"] - current_parcel.save() + not_deleted = True + for key, value in data.items(): + if key == "DELETE" and value == True: + current_parcel.delete() + not_deleted = False + if not_deleted: + current_parcel.year = post_data.get("year") + current_parcel.section = post_data.get("section") + current_parcel.parcel_number = post_data.get("parcel_number") + current_parcel.town = post_data.get("town") + current_parcel.save() else: parcel_to_add = models.Parcel.objects.create( - year = post_data.get["year"], - section = post_data.get["section"], - parcel_number = post_data.get["parcel_number"], - town = post_data.get["town"] + year = post_data.get("year"), + section = post_data.get("section"), + parcel_number = post_data.get("parcel_number"), + town = post_data.get("town") ) operation.parcels.add(parcel_to_add) @@ -462,7 +465,7 @@ def operation_modify_parcels(request, pk): town = models.Town.objects.get(pk=parcel.town_id) initial.append({ "pk": parcel.pk, - "town": town.pk, + "town": town, "year": parcel.year, "section": parcel.section, "parcel_number": parcel.parcel_number, |