activeadmin 3.5.0 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa1c1c32021e663fdfbf9f57274716deb64f84ac184453bc2b73b6073053303
-  data.tar.gz: 183d57d9d1d7bf90399aaeb8e46ba97077ec30f3028ead82d34d976de1cd295c
+  metadata.gz: be95e31901e8d39cce8d91294688462aab2b0de748a1e42ab78225a80cf3691c
+  data.tar.gz: 627f265f8ff2cafbae08e8e620e6a838c724c60bb3ac1d25327485587cade73f
 SHA512:
-  metadata.gz: 6bb9e12a1b4efcf8ed33044499cffb92019ca3e5b9b81b02aa94586f142fb8f22f68e7659c01551c07d2a37fecea912cf7ac61e28c05c2e4a531b5ea74f262e2
-  data.tar.gz: 6de75bee7cec2b1241ce989d55186a19801d272ccc4d2b06e73e022043f20e16c1781ae9ca00906681d6a2f5db22f1f6f6baa3f67b05703e2b7dacefd863f896
+  metadata.gz: 7a4382f75f12aa918e5a027e9f56244b9b957fc1efcce1b20faae4005406c90f328857d96ba828a9b5b4f55e364d31a529fcb8c626eeece5a95b7458eab6a795
+  data.tar.gz: 8f52969b691a64f6ebe7a8401fe8a5f39fc3cb745bd73b5754f6071583fd450a9d2cd4568cc64f7ae51aa536eba10e57173dffbb9c1d554137cf7d423a3ac9db

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## 3.5.2 [☰](https://github.com/activeadmin/activeadmin/compare/v3.5.1..v3.5.2)
+
+### Bug Fixes
+
+* Backport run update_resource inside a transaction to avoid autosaving relationships through assign_attributes when the record is invalid [#9064] by [@mgrunberg] and [@deivid-rodriguez]
+
+## 3.5.1 [☰](https://github.com/activeadmin/activeadmin/compare/v3.5.0..v3.5.1)
+
+### Bug Fixes
+
+* Fix UI issue in modal dialog [#8978] by @tagliala
+
 ## 3.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.4.0..v3.5.0)
 
 ### Enhancements
@@ -1003,6 +1015,8 @@ Please check [0-6-stable] for previous changes.
 [#8837]: https://github.com/activeadmin/activeadmin/pull/8837
 [#8964]: https://github.com/activeadmin/activeadmin/pull/8964
 [#8965]: https://github.com/activeadmin/activeadmin/pull/8965
+[#8978]: https://github.com/activeadmin/activeadmin/pull/8978
+[#9064]: https://github.com/activeadmin/activeadmin/pull/9064
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111

data/app/assets/javascripts/active_admin/base.js

@@ -69,7 +69,9 @@
       open: function open(_event, _ui) {
         $("body").trigger("modal_dialog:after_open", [ form ]);
       },
-      dialogClass: "active_admin_dialog",
+      classes: {
+        "ui-dialog": "active_admin_dialog"
+      },
       buttons: {
         OK: function OK() {
           callback($(this).serializeObject());

data/app/javascript/active_admin/lib/modal-dialog.js

@@ -47,7 +47,7 @@ function ModalDialog(message, inputs, callback){
     open(_event, _ui) {
       $('body').trigger('modal_dialog:after_open', [form]);
     },
-    dialogClass: 'active_admin_dialog',
+    classes: { 'ui-dialog': 'active_admin_dialog' },
     buttons: {
       OK() {
         callback($(this).serializeObject());

data/lib/active_admin/resource_controller/data_access.rb

@@ -168,11 +168,16 @@ module ActiveAdmin
       #
       # @return [void]
       def update_resource(object, attributes)
-        object = assign_attributes(object, attributes)
+        status = nil
+        ActiveRecord::Base.transaction do
+          object = assign_attributes(object, attributes)
 
-        run_update_callbacks object do
-          save_resource(object)
+          run_update_callbacks object do
+            status = save_resource(object)
+            raise ActiveRecord::Rollback unless status
+          end
         end
+        status
       end
 
       # Destroys an object from the database and calls appropriate callbacks.

data/lib/active_admin/router.rb

@@ -68,7 +68,7 @@ module ActiveAdmin
       router.get "/#{page}", to: "#{page}#index"
       config.page_actions.each do |action|
         Array.wrap(action.http_verb).each do |verb|
-          build_route(verb, "/#{page}/#{action.name}" => "#{page}##{action.name}")
+          build_route(verb, "/#{page}/#{action.name}", to: "#{page}##{action.name}")
         end
       end
     end

data/lib/active_admin/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveAdmin
-  VERSION = "3.5.0"
+  VERSION = "3.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.2
 platform: ruby
 authors:
 - Charles Maresh