Files: Fix ajax request removing to many elements for action delete

TYPE: Bugfix LINK: ogc-1851
OneGov · Nov 18, 2024 · 6b23b2e · 6b23b2e
1 parent 6e8ccdc
commit 6b23b2e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/onegov/org/templates/macros.pt b/src/onegov/org/templates/macros.pt
@@ -1907,7 +1907,6 @@
                 ic-on-success="
                     var info = $(elt).closest('tr');
                     info.prev().remove();
-                    info.next().remove();
                     info.remove();
                 "
                 data-confirm="Do you really want to delete this file?"
@@ -2231,7 +2230,7 @@
                 <p tal:repeat="value results.get(field.id, [])">"${value}"</p>
             </tal:b>
         </p>
-        <tal:b tal:condition="field.type in aggregated">      
+        <tal:b tal:condition="field.type in aggregated">
             <div class="chart-wrap" tal:condition="field.type == 'MultiCheckboxField'">
                 <div tal:define="maximum max(results[field.id].values())" class="grid horizontal">
                     <tal:b tal:repeat="choice field.choices">
@@ -2249,7 +2248,7 @@
                         </tal:b>
                     </tal:b>
                 </div>
-            </div> 
+            </div>
         </tal:b>
     </tal:b>
 </metal:display_results>
diff --git a/src/onegov/town6/templates/macros.pt b/src/onegov/town6/templates/macros.pt
@@ -2353,10 +2353,21 @@
         <a class="button secondary confirm delete" role="button"
             ic-delete-from="${request.link(file)}?csrf-token=${layout.csrf_token}"
             ic-on-success="
-                var info = $(elt).closest('tr');
-                info.prev().remove();
-                info.next().remove();
-                info.remove();
+                var cfd = $(elt).closest('tr');  // current file details row
+                var cfi = cfd.prev();  // current file info row
+                var rbfi = cfi.prev();  // row before current file info
+                var rafd = cfd.next();  // row after current file details
+
+                cfi.remove();  // remove current file info row
+                cfd.remove();  // remove current file details row
+
+                // if file is last in group, remove the group tr as well
+                if (!rbfi.is('[id^=\'details-\']') &&
+                    !rbfi.hasClass('file-info') &&
+                    !rafd.is('[id^=\'details-\']') &&
+                    !rafd.hasClass('file-info')) {
+                    rbfi.remove();  // remove line before file-info row
+                }
             "
             data-confirm="Do you really want to delete this file?"
             data-confirm-extra="${file.name}"