don't reload after deleting last record if there is no pagination

activescaffold · Dec 13, 2024 · 0224c9b · 0224c9b
1 parent de7667f
commit 0224c9b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/assets/javascripts/jquery/active_scaffold.js b/app/assets/javascripts/jquery/active_scaffold.js
@@ -637,6 +637,11 @@
           jQuery(tbody).parent().find('tbody.messages p.empty-message').hide();
         }
       },
+      show_empty_message: function(tbody) {
+        if (this.records_for(tbody).length != 0) {
+          jQuery(tbody).parent().find('tbody.messages p.empty-message').hide();
+        }
+      },
       reload_if_empty: function(tbody, url) {
         if (this.records_for(tbody).length == 0) {
           this.reload(url);
@@ -839,6 +844,7 @@
           ActiveScaffold.stripe(tbody);
           ActiveScaffold.decrement_record_count(tbody.closest('div.active-scaffold'));
           if (page_reload_url) ActiveScaffold.reload_if_empty(tbody, page_reload_url);
+          else ActiveScaffold.show_empty_message(tbody);
         });
       },
 

diff --git a/app/views/active_scaffold_overrides/destroy.js.erb b/app/views/active_scaffold_overrides/destroy.js.erb
@@ -17,10 +17,13 @@
     <%= render 'refresh_list', no_history: true %>
   <% else %>
     <%
-      url = main_path_to_return
-      url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a?(Hash) && active_scaffold_config.actions.include?(:list)
+      if active_scaffold_config.actions.exclude?(:list) || active_scaffold_config.list.pagination
+        url = main_path_to_return
+        url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a?(Hash) && active_scaffold_config.actions.include?(:list)
+        url = url_for(url)
+      end
     %>
-    ActiveScaffold.delete_record_row('<%= element_row_id(:action => 'list', :id => params[:id]) %>', '<%= url_for(url) %>');
+    ActiveScaffold.delete_record_row('<%= element_row_id(:action => 'list', :id => params[:id]) %>', '<%= url %>');
     <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% end %>
 <% else %>