Skip to content

Commit

Permalink
Merge branch '3-7-stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
scambra committed Dec 13, 2024
2 parents 59434bf + f743a6c commit 6a87ffb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
- Thread safety enabled by default, can't be disabled, deprecate ActiveScaffold.threadsafe!
- Support separators in action links

= 3.7.11 (not released yet)
- Add partial list_messages_content to reduce code duplication, and better support replacing list view with other way to render records
- Support selector for records body in create_record_row JS method, better support replacing list view with other way to render records

= 3.7.10
- Move code from on_create.js.erb to partials, so it's easier to change parts, e.g. how new record is rendered
- Don't reload after deleting last record if pagination is disabled
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/jquery/active_scaffold.js
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@

create_record_row: function(active_scaffold_id, html, options) {
if (typeof(active_scaffold_id) == 'string') active_scaffold_id = '#' + active_scaffold_id;
var tbody = jQuery(active_scaffold_id).find('tbody.records').first(), new_row;
var tbody = jQuery(active_scaffold_id).find(options.body_selector || 'tbody.records').first(), new_row;

if (options.insert_at == 'top') {
tbody.prepend(html);
Expand Down Expand Up @@ -840,10 +840,10 @@
});
},

delete_record_row: function(row, page_reload_url) {
delete_record_row: function(row, page_reload_url, body_selector) {
if (typeof(row) == 'string') row = '#' + row;
row = jQuery(row);
var tbody = row.closest('tbody.records');
var tbody = row.closest(body_selector || 'tbody.records');

row.find('a.disabled').each(function() {;
var action_link = ActiveScaffold.ActionLink.get(this);
Expand Down

0 comments on commit 6a87ffb

Please # to comment.