File - Parcels - Modify: add get method for modifying parcels #5227

3 files changed, 3 insertions, 66 deletions

diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 5c637aacf..9d0018f28 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -1694,7 +1694,7 @@ class Operation(
                     reverse("operation-parcels-modify", args=[self.pk]),
                     _("Modify Parcels"),
                     "fa fa-pencil",
-                    _("Parcels"),
+                    _("parcels"),
                     "",
                     True,
                 ),
diff --git a/archaeological_operations/templates/ishtar/forms/operation_modify_parcels.html b/archaeological_operations/templates/ishtar/forms/operation_modify_parcels.html
deleted file mode 100644
index b9882c12c..000000000
--- a/archaeological_operations/templates/ishtar/forms/operation_modify_parcels.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% load i18n inline_formset table_form %}
-
-<div class="modal-dialog modal-lg">
-    <div class="modal-content">
-        <div class="modal-header">
-            <h2>{{ formset.form_label }}</h2>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <form enctype="multipart/form-data" action="{{url}}" method="post" id="qa-action">
-            {{ formset.management_form }}
-            {% bs_form formset.selection_form %}
-            {% csrf_token %}
-            <div class="modal-body body-scroll">
-                <div class='form'>
-                    {% block main_form %}
-                    <table class='inline-table'>
-                        <tr>
-                            {% for field in formset.forms.0 %}
-                            {% if field.name != 'pk' %}{% if field.required %}<th{%else%}<td{% endif %}{% if not forloop.last %} rowspan='2'{% endif %}>
-                            {{ field.label_tag }}{% if field.required %}</th>{%else%}</td>{% endif %}{% endif %}{% endfor %}
-                        </tr>
-                        <tr><td>({% trans "all"%} <input type='checkbox' name='check-all' class='check-all'/>)</td></tr>
-                        {% inline_formset 'Parcels' formset.forms False %}
-                    </table>
-
-                    {% endblock %}
-                </div>
-            </div>
-            <div class="modal-footer">
-                {% block footer %}
-                    <button type="submit" id="submit_form" name='validate'
-                        value="validate" class="btn btn-success">
-                        {% if action_name %}
-                            {{ action_name }}
-                        {% else %}
-                            {% trans "Add/Modify" %}
-                        {% endif %}
-                    </button>
-                    <button type="button" data-dismiss="modal"
-                        aria-label="Close" class="btn btn-secondary">
-                        {% trans "Cancel" %}
-                    </button>
-                {% endblock %}
-            </div>
-        </form>
-    </div>
-</div>
-<script type="text/javascript">
-    {% block js %}
-    {% endblock %}
-    $(document).ready(function(){
-        qa_action_register("{{url}}");
-    {% block js_ready %}
-    {% endblock %}
-    });
-</script>
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 0cd1cd8cf..d0d33194f 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -489,15 +489,10 @@ def operation_modify_parcels(request, pk):
                     )
                     operation.parcels.add(parcel_to_add)
             return redirect(reverse("operation-parcels-modify", args=[pk]))
-        else:
-            print(formset.errors)
-            print(formset.non_form_errors())
     else:
         formset = formset_class(initial=initial, data=data)
-#
-    #  for form in formset:
-        #  print(form.as_table())
-    return render(request, 'ishtar/forms/operation_modify_parcels.html', {
+
+    return render(request, 'ishtar/forms/modify_parcels.html', {
         'formset': formset,
         "url": reverse("operation-parcels-modify", args=[pk])
     })