EditTable fixes (iommirocks#706)

* fixed EdtTable row deleting - removing required and pattern attrs

* fixed EditTable row deleting with changed fields' values

* fixed comment

* fixed comment

Author: berycz

iommi/edit_table.py

@@ -329,9 +329,12 @@ def validate(cells_iterator, form, errors):
     if table.edit_errors or table.create_errors:
         return None
 
+    deleted_pks = set()
     if isinstance(table.initial_rows, QuerySet):
         prefix = path_join(table.iommi_path, 'pk_delete_')
-        table.bulk_queryset(prefix=prefix).delete()
+        qs = table.bulk_queryset(prefix=prefix)
+        deleted_pks = set(qs.values_list('pk', flat=True))
+        qs.delete()
 
     def save(cells_iterator, form):
         to_save = []
@@ -340,6 +343,8 @@ def save(cells_iterator, form):
                 continue
             instance = cells.row
             form.instance = instance
+            if instance is not None and instance.pk is not None and instance.pk in deleted_pks:
+                continue
             attrs_to_save = []
             to_save_in_second_phase = []
             for cell in cells.iter_editable_cells():

iommi/edit_table__tests.py

@@ -397,6 +397,7 @@ def test_edit_table_post_delete():
 def test_edit_table_delete_new_row_and_existing_row():
     existing_foo = TFoo.objects.create(a=1, b='existing')
     another_foo = TFoo.objects.create(a=2, b='another')
+    third__foo = TFoo.objects.create(a=3, b='third')
 
     edit_table = EditTable(
         auto__model=TFoo,
@@ -423,6 +424,11 @@ def test_edit_table_delete_new_row_and_existing_row():
                 f'columns/a/{existing_foo.pk}': str(existing_foo.a),
                 f'columns/b/{existing_foo.pk}': existing_foo.b,
 
+                # Mark existing row for deletion, but pass some changes too
+                f'pk_delete_{third__foo.pk}': '',
+                f'columns/a/{third__foo.pk}': str(third__foo.a),
+                f'columns/b/{third__foo.pk}': 'third but changed',
+
                 # Data for the other existing row (unchanged)
                 f'columns/a/{another_foo.pk}': str(another_foo.a),
                 f'columns/b/{another_foo.pk}': another_foo.b,
@@ -434,6 +440,7 @@ def test_edit_table_delete_new_row_and_existing_row():
     assert response.status_code == 302
     assert not TFoo.objects.filter(pk=existing_foo.pk).exists()
     assert TFoo.objects.filter(pk=another_foo.pk).exists()
+    assert not TFoo.objects.filter(pk=third__foo.pk).exists()
     new_row = TFoo.objects.filter(a=88, b='new row to keep').first()
     assert new_row is not None
     assert not TFoo.objects.filter(a=99, b='new row to delete').exists()

iommi/static/js/iommi.js

@@ -439,6 +439,7 @@ class IommiBase {
     }
 
     initEditTableDeleteRowButton() {
+        // check/uncheck checkbox based on delete button
         IommiBase.addLiveEventListener(
             'click',
             '[data-iommi-edit-table-delete-row-button]',
@@ -455,6 +456,34 @@ class IommiBase {
                 return false;
             }
         );
+
+        // remove/restore required and pattern
+        IommiBase.addLiveEventListener(
+            'change',
+            '[data-iommi-edit-table-delete-row-checkbox]',
+            function (event) {
+                const row = this.closest('[data-iommi-edit-table-row]');
+                if(this.checked) {
+                    row.querySelectorAll('[required]').forEach((field) => {
+                        field.setAttribute('data-iommi-attr-bak-required', true);
+                        field.removeAttribute('required');
+                    });
+                    row.querySelectorAll('[pattern]').forEach((field) => {
+                        field.setAttribute('data-iommi-attr-bak-pattern', field.getAttribute('pattern'));
+                        field.removeAttribute('pattern');
+                    });
+                } else {
+                    row.querySelectorAll('[data-iommi-attr-bak-required]').forEach((field) => {
+                        field.setAttribute('required', true);
+                        field.removeAttribute('data-iommi-attr-bak-required');
+                    });
+                    row.querySelectorAll('[data-iommi-attr-bak-pattern]').forEach((field) => {
+                        field.setAttribute('pattern', field.getAttribute('data-iommi-attr-bak-pattern'));
+                        field.removeAttribute('data-iommi-attr-bak-pattern');
+                    });
+                }
+            }
+        );
     }
 
     initEditTableAddRowButton() {