Skip to content

Commit 3aa69cf

Browse files
committed
Merge branch '4-1-stable'
2 parents e8579c8 + 3e75f75 commit 3aa69cf

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

CHANGELOG.rdoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
- Open dynamic action link group nested in the menu tree, under the action opening it.
2121
- Add sort_joins to column, defaults to includes value, so it's possible to set sort by SQL without joining the includes, or join with some associations, and preload others.
2222

23+
= 4.1.5
24+
- Fix update_columns global config for field search ac
25+
2326
= 4.1.4
2427
- Fix dirty attributes on refresh_field action, record is built on unsaved instance copying attributes, but it reports only changed attributes from the form now
2528
- Fix incompatibility with Rails renderable objects (ViewComponent, Turbo Streams)

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GIT
77
PATH
88
remote: .
99
specs:
10-
active_scaffold (4.1.4)
10+
active_scaffold (4.1.5)
1111
dartsass-sprockets (~> 3.2.0)
1212
ice_nine (~> 0.11)
1313
rails (>= 7.2.0)

gemfiles/Gemfile.rails-7.2.x.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ..
33
specs:
4-
active_scaffold (4.1.4)
4+
active_scaffold (4.1.5)
55
dartsass-sprockets (~> 3.2.0)
66
ice_nine (~> 0.11)
77
rails (>= 7.2.0)

lib/active_scaffold/config/field_search.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ def initialize(core_config)
1111
@human_conditions = self.class.human_conditions
1212
@floating_footer = self.class.floating_footer
1313
@reset_form = self.class.reset_form
14+
@update_columns = self.class.update_columns
1415
end
1516

1617
# global level configuration

lib/active_scaffold/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveScaffold
44
module Version
55
MAJOR = 4
66
MINOR = 1
7-
PATCH = 4
7+
PATCH = 5
88
FIX = nil
99

1010
STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

0 commit comments

Comments
 (0)