avo 1.20.2.pre.1 → 1.20.2.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1637660ec39f73cf35fe0078d721b17ab5a2aded94fdbf633ce3b63c326c55a0
-  data.tar.gz: c990f246d271819abe2f098ecea83bb6b367cad93e6fc0cc0994d54c08e8dc64
+  metadata.gz: a674dcf4fc813cc44eb1338ee81a79cf18f4e32fa43c3043fd9b379e90e0287d
+  data.tar.gz: aa4d972f61fc521cbd3aba2c1130f2d5488c542f6b96f55e125a45cd678790d4
 SHA512:
-  metadata.gz: 18fb3a1ee203bc93a1863e8138c3a7f7fac5faf4775e92fc7208fce652b1420e8efe9df28482ac30626b2095ebb4981aafaa9d8153fee6a1b5b09a0e30c8eb84
-  data.tar.gz: b74310670a84f49c7ba06847e018c9c41542f08376e95650126b74818aeb3fd73acf151647450ba69676e876e517a2a88986ae4d12b2336f027353f4841f7ba8
+  metadata.gz: 15c38ab033891c33e2051f002f6aba6646b775f760e8e1457db83c5eb3abd95c37f75ec6a3352d6cda8f4d660c765f480ae9c33b65634c320d551a06b5bd8084
+  data.tar.gz: 3279dad375d248984016e9cc91c55d8c8338d1404ee0e89177df15d2d8e782147a2e7c29e3a41b79a3a84afcf87cb08a255c2084f048819c535e833b20c60ec7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.20.2.pre.1)
+    avo (1.20.2.pre.2)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/controllers/avo/application_controller.rb

@@ -111,7 +111,13 @@ module Avo
     end
 
     def fill_model
-      @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+      # We have to skip filling the the model if this is an attach action
+      is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
+      # puts ['fill_model->', is_attach_action, model_param_key].inspect
+
+      unless is_attach_action
+        @model = @resource.fill_model(@model_to_fill, cast_nullable(model_params))
+      end
     end
 
     def hydrate_resource
@@ -187,18 +193,6 @@ module Avo
       query
     end
 
-    # def authorize_user
-    #   return if params[:controller] == 'avo/search'
-
-    #   model = record = resource.model
-
-    #   if ['show', 'edit', 'update'].include?(params[:action]) && params[:controller] == 'avo/resources'
-    #     record = resource
-    #   end
-
-    #   # AuthorizationService::authorize_action _current_user, record, params[:action] return render_unauthorized unless
-    # end
-
     def _authenticate!
       instance_eval(&Avo.configuration.authenticate)
     end
@@ -243,5 +237,9 @@ module Avo
     def on_api_path
       request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
+
+    def model_param_key
+      @resource.form_scope
+    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -193,8 +193,6 @@ module Avo
     private
 
     def model_params
-      model_param_key = @resource.form_scope
-
       request_params = params.require(model_param_key).permit(permitted_params)
 
       if @resource.devise_password_optional && request_params[:password].blank? && request_params[:password_confirmation].blank?

data/lib/avo/fields/key_value_field.rb

@@ -44,10 +44,10 @@ module Avo
 
       def options
         {
-          # key_label: @key_label,
-          # value_label: @value_label,
-          # action_text: @action_text,
-          # delete_text: @delete_text,
+          key_label: @key_label,
+          value_label: @value_label,
+          action_text: @action_text,
+          delete_text: @delete_text,
           disable_editing_keys: @disable_editing_keys,
           disable_adding_rows: @disable_adding_rows,
           disable_deleting_rows: @disable_deleting_rows

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.20.2.pre.1"
+  VERSION = "1.20.2.pre.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 1.20.2.pre.1
+  version: 1.20.2.pre.2
 platform: ruby
 authors:
 - Adrian Marin