activeadmin 3.2.5 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 99b9db7d0e925b5764b5141008734fa147cbb742e0f3e62476a7dcc8fb1f0485
4
- data.tar.gz: b0f5aa9c2dc4c1923e7cac2b893a0a2d871ddb67cdec7183dc7886b5adea97e6
3
+ metadata.gz: e080845beb483b8364c49bb199ac8b4ba61975854316d053df39b39208d863bf
4
+ data.tar.gz: c30bcfde594fb30c2a8796741451f245b77ddeaa66c6a66ecbfbcbec3064918a
5
5
  SHA512:
6
- metadata.gz: efa9d0ded1ac54f680ab3409019cf425a578d18bd89c73b4a39cc219cbbb50e25abeb294d771724394648432704e5bbcb10729ea5aa4e89150c00c3de876755d
7
- data.tar.gz: c85cd6bfc4f4cbaa4345d960c8c797ab4066d58f131116b79100195edd6e269ac8f1867441442801c7a7eea4cefebe36506db373284d28b7ee48fa826d05bdcc
6
+ metadata.gz: fe64d783c2ac39dbbc74df16985dabcbee5e300039f8b703df6ccedf7dee24dcda09dd59b154383ba0dc593310f163dd6ca51af5f59d26b11646683158eeae4a
7
+ data.tar.gz: f4e988b7bf89e2cb291822c62d891d958ec48400e3ccee31fc2480b47ee1c8ab80608c939abb80733378c2f27a245044d1f89c68fe04c8fd850264df072ae8d1
data/CHANGELOG.md CHANGED
@@ -2,6 +2,22 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
+ ## 3.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.5..v3.3.0)
6
+
7
+ ### Enhancements
8
+
9
+ * Improve v3 docs regarding compatibility with vite_rails [#8548] by [@mattbrictson]
10
+ * Backport test against Rails 8.0 [#8556] by [@mgrunberg] and [@tagliala]
11
+ * Test against Ruby 3.4 [#8614] by [@tagliala]
12
+ * Backport Support sortable argument in id_column [#8650] by [@jaynetics]
13
+ * Backport Support title for id_column [#8652] by [@mgrunberg]
14
+
15
+ ### Bug Fixes
16
+
17
+ * Backport Fix attributes passed to form has_many not being set on new record form items [#8551] by [@Fs00]
18
+ * Backport Fix deprecation warning in Ruby 3.4 [#8596] by [@tagliala]
19
+ * Backport Fix circular require warning in belongs_to.rb [#8601] by [@tagliala]
20
+
5
21
  ## 3.2.5 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.4..v3.2.5)
6
22
 
7
23
  ### Enhancements
@@ -960,6 +976,14 @@ Please check [0-6-stable] for previous changes.
960
976
  [#8468]: https://github.com/activeadmin/activeadmin/pull/8468
961
977
  [#8469]: https://github.com/activeadmin/activeadmin/pull/8469
962
978
  [#8470]: https://github.com/activeadmin/activeadmin/pull/8470
979
+ [#8548]: https://github.com/activeadmin/activeadmin/pull/8548
980
+ [#8551]: https://github.com/activeadmin/activeadmin/pull/8551
981
+ [#8556]: https://github.com/activeadmin/activeadmin/pull/8556
982
+ [#8596]: https://github.com/activeadmin/activeadmin/pull/8596
983
+ [#8601]: https://github.com/activeadmin/activeadmin/pull/8601
984
+ [#8614]: https://github.com/activeadmin/activeadmin/pull/8614
985
+ [#8650]: https://github.com/activeadmin/activeadmin/pull/8650
986
+ [#8652]: https://github.com/activeadmin/activeadmin/pull/8652
963
987
 
964
988
  [@1000ship]: https://github.com/1000ship
965
989
  [@5t111111]: https://github.com/5t111111
@@ -1040,6 +1064,7 @@ Please check [0-6-stable] for previous changes.
1040
1064
  [@Looooong]: https://github.com/Looooong
1041
1065
  [@lubosch]: https://github.com/lubosch
1042
1066
  [@markstory]: https://github.com/markstory
1067
+ [@mattbrictson]: https://github.com/mattbrictson
1043
1068
  [@mauriciopasquier]: https://github.com/mauriciopasquier
1044
1069
  [@mconiglio]: https://github.com/mconiglio
1045
1070
  [@mgrunberg]: https://github.com/mgrunberg
@@ -95,7 +95,7 @@ module ActiveAdmin
95
95
  contents = without_wrapper { inputs(options, &form_block) }
96
96
  contents ||= "".html_safe
97
97
 
98
- js = new_record ? js_for_has_many(options[:class], &form_block) : ""
98
+ js = new_record ? js_for_has_many(&form_block) : ""
99
99
  contents << js
100
100
  end
101
101
 
@@ -159,14 +159,13 @@ module ActiveAdmin
159
159
  end
160
160
 
161
161
  # Capture the ADD JS
162
- def js_for_has_many(class_string, &form_block)
162
+ def js_for_has_many(&form_block)
163
163
  assoc_name = assoc_klass.model_name
164
- placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(/\//, '_')}_RECORD"
165
- opts = {
164
+ placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.tr('/', '_')}_RECORD"
165
+ opts = options.merge(
166
166
  for: [assoc, assoc_klass.new],
167
- class: class_string,
168
167
  for_options: { child_index: placeholder }
169
- }
168
+ )
170
169
  html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
171
170
  text = new_record.is_a?(String) ? new_record : I18n.t("active_admin.has_many_new", model: assoc_name.human)
172
171
 
@@ -15,9 +15,7 @@ module ActiveAdmin
15
15
  if searchable_has_many_through?
16
16
  "#{reflection.through_reflection.name}_#{reflection.foreign_key}"
17
17
  else
18
- name = method.to_s
19
- name.concat "_#{reflection.association_primary_key}" if reflection_searchable?
20
- name
18
+ reflection_searchable? ? "#{method}_#{reflection.association_primary_key}" : method.to_s
21
19
  end
22
20
  end
23
21
 
@@ -1,5 +1,4 @@
1
1
  # frozen_string_literal: true
2
- require "active_admin/resource"
3
2
 
4
3
  module ActiveAdmin
5
4
  class Resource
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module ActiveAdmin
3
- VERSION = "3.2.5"
3
+ VERSION = "3.3.0"
4
4
  end
@@ -291,9 +291,14 @@ module ActiveAdmin
291
291
  end
292
292
 
293
293
  # Display a column for the id
294
- def id_column
294
+ def id_column(*args)
295
295
  raise "#{resource_class.name} has no primary_key!" unless resource_class.primary_key
296
- column(resource_class.human_attribute_name(resource_class.primary_key), sortable: resource_class.primary_key) do |resource|
296
+
297
+ options = args.extract_options!
298
+ title = args[0].presence || resource_class.human_attribute_name(resource_class.primary_key)
299
+ sortable = options.fetch(:sortable, resource_class.primary_key)
300
+
301
+ column(title, sortable: sortable) do |resource|
297
302
  if controller.action_methods.include?("show")
298
303
  link_to resource.id, resource_path(resource), class: "resource_id_link"
299
304
  elsif controller.action_methods.include?("edit")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activeadmin
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.5
4
+ version: 3.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Charles Maresh
@@ -15,7 +15,7 @@ authors:
15
15
  autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
- date: 2024-09-05 00:00:00.000000000 Z
18
+ date: 2025-03-08 00:00:00.000000000 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: arbre
@@ -533,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
533
533
  - !ruby/object:Gem::Version
534
534
  version: '0'
535
535
  requirements: []
536
- rubygems_version: 3.5.16
536
+ rubygems_version: 3.5.22
537
537
  signing_key:
538
538
  specification_version: 4
539
539
  summary: Active Admin is a Ruby on Rails plugin for generating administration style