activeadmin_addons 1.8.3 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55def873497d38747a6897932970590af63bd4dd135293804d7b39a938fd082f
-  data.tar.gz: 7e544cbc4d57033643f9334d46c05769044423faca46b1a2ea3b8335340a4ecd
+  metadata.gz: 31434452186d9b02e7d7272b27d06d1e4831b1c4c6de9c068e973cf5311da476
+  data.tar.gz: 0a43f7f1d45b50c01eeb4b4f7a56f5ff9bcb4329a24adb4f77fc1d1ca28fa0e7
 SHA512:
-  metadata.gz: 91987d8083fb82cfb200f87bd252ccaed20bbb7072be7ff9853d492e13baf089d6bd4e564996711f25f44f4105608de539e68dac4d17d918c0c74f3fb497577e
-  data.tar.gz: 770e27656a0ba98f37a32e449c35ed06a55d7cb9b07b090177bebcee25681b76d0c9c12f10507da31a068e7114ff76b9d5709a4e950867f5c2948d73225ca3e7
+  metadata.gz: 10db20adc03c85569ab16debe8edffd16115b348baf7779e79544fa42a265058cc60d3d24ac77dea5e85591297a6daeb2ede226141cb7dbb4e34d0776966462a
+  data.tar.gz: b911e25eeb0801b2bbe7857c012f4c93fa71a2bf77d574d552461e39cdedfcdd698673ed625a4034c749852f2d1b47e1387a7b7c0a4f754cdb3311c753beab6a

data/app/inputs/date_time_picker_input.rb

@@ -43,9 +43,8 @@ class DateTimePickerInput < ActiveAdminAddons::InputBase
 
   def datetime_picker_options
     @datetime_picker_options ||= begin
-      opts = options.fetch(:picker_options, {})
-      opts = Hash[opts.map { |k, v| [k.to_s.camelcase(:lower), v] }]
-      default_picker_options.merge(opts)
+      opts = default_picker_options.merge(options.fetch(:picker_options, {}))
+      Hash[opts.map { |k, v| [k.to_s.camelcase(:lower), v] }]
     end
   end
 

data/app/inputs/nested_select_input.rb

@@ -15,6 +15,7 @@ class NestedSelectInput < ActiveAdminAddons::InputBase
   def hierarchy
     data = get_levels_data
     raise("Undefined levels on nested_select") if data.empty?
+
     set_parent_attributes(data)
     data.reverse
   end
@@ -67,17 +68,26 @@ class NestedSelectInput < ActiveAdminAddons::InputBase
     parent_attribute = level_data[:parent_attribute]
     build_virtual_attr(parent_attribute)
     instance = instance_from_attribute_name(level_data[:attribute])
-    if instance && instance.respond_to?(parent_attribute)
+    if instance&.respond_to?(parent_attribute)
       @object.send("#{parent_attribute}=", instance.send(parent_attribute))
     end
   end
 
   def instance_from_attribute_name(attribute)
     return unless attribute
+
     attribute_value = @object.send(attribute)
     return unless attribute_value
-    klass = attribute.to_s.chomp("_id").camelize.constantize
-    klass.find_by_id(attribute_value)
+
+    klass = class_from_attribute(attribute)
+    klass.find_by(id: attribute_value)
+  end
+
+  def class_from_attribute(attribute)
+    association_name = attribute.to_s.chomp("_id")
+    association_name.camelize.constantize
+  rescue NameError
+    object_class.reflect_on_association(association_name).klass
   end
 
   def build_virtual_attr(attribute_name)

data/lib/activeadmin_addons/addons/tag_builder.rb

@@ -45,7 +45,7 @@ module ActiveAdminAddons
         'data-model' => class_name,
         'data-object_id' => model.id,
         'data-field' => attribute,
-        'data-url' => context.resource_path(model),
+        'data-url' => resource_url,
         'data-value' => data
       }
     end

data/lib/activeadmin_addons/support/input_helpers/input_html_helpers.rb

@@ -16,6 +16,7 @@ module ActiveAdminAddons
 
     def method_to_input_id(id)
       raise "invalid input id" if id.blank?
+
       "#{prefixed_method}_#{id}"
     end
 

data/lib/activeadmin_addons/support/input_helpers/input_methods.rb

@@ -6,11 +6,13 @@ module ActiveAdminAddons
 
     def valid_method
       raise "invalid method given" if method.blank?
+
       method
     end
 
     def valid_object
       raise "blank object given" if @object.blank?
+
       @object
     end
 
@@ -42,6 +44,10 @@ module ActiveAdminAddons
       @input_value ||= valid_object.send(valid_method)
     end
 
+    def input_association_value
+      @input_association_value ||= valid_object.send(association_name)
+    end
+
     def translated_method
       valid_object.class.human_attribute_name(valid_method)
     end
@@ -60,6 +66,7 @@ module ActiveAdminAddons
     def build_virtual_attr
       attribute_name = "virtual_#{valid_method}_attr"
       fail "#{attribute_name} is already defined" if valid_object.respond_to?(attribute_name)
+
       valid_object.singleton_class.send(:attr_accessor, attribute_name)
       attribute_name
     end

data/lib/activeadmin_addons/support/input_helpers/input_options_handler.rb

@@ -41,6 +41,7 @@ module ActiveAdminAddons
     def load_class(class_attr)
       @css_classes ||= []
       return if class_attr.blank?
+
       class_attr = class_attr.strip
       @css_classes << class_attr
       class_attr
@@ -49,6 +50,7 @@ module ActiveAdminAddons
     def get_data_attr_value(attr_name)
       item = data_attr_options[attr_name.to_sym]
       return unless item
+
       item[:value]
     end
 
@@ -56,13 +58,14 @@ module ActiveAdminAddons
 
     def formatted_option_value(item)
       return item[:value].send(item[:formatter]) if item[:formatter]
+
       item[:value]
     end
 
     def load_option_attr(attr_name, options)
       value = calculate_attr_value(attr_name, options)
       item = { value: value }
-      item[:formatter] = options[:formatter] unless options[:formatter].blank?
+      item[:formatter] = options[:formatter] if options[:formatter].present?
       item
     end
 
@@ -80,6 +83,7 @@ module ActiveAdminAddons
       default_value = attr_options[:default]
       return unless default_value
       return default_value.call if default_value.is_a?(Proc)
+
       default_value
     end
 

data/lib/activeadmin_addons/support/input_helpers/select_helpers.rb

@@ -42,6 +42,7 @@ module ActiveAdminAddons
 
     def item_to_select_option(item)
       return unless item
+
       {
         id: item.send((valid_options[:value] || :id)),
         text: item.send((valid_options[:display_name] || :name))
@@ -66,19 +67,26 @@ module ActiveAdminAddons
     end
 
     def selected_item
-      @selected_item ||= selected_collection.first
+      @selected_item ||= begin
+                           input_association_value
+                         rescue NoMethodError
+                           selected_collection.first
+                         end
     end
 
     private
 
     def active_record_relation?(value)
       klass = value.class.name
-      klass == "ActiveRecord::Relation" ||
-        klass == "ActiveRecord::Associations::CollectionProxy"
+      [
+        "ActiveRecord::Relation",
+        "ActiveRecord::Associations::CollectionProxy"
+      ].include?(klass)
     end
 
     def valid_options
       raise "missing @options hash" unless !!@options
+
       @options
     end
 

data/lib/activeadmin_addons/support/set_datepicker.rb

@@ -5,9 +5,19 @@ module ::Formtastic
 
       def default_input_type(method, options = {})
         input_type = original_default_input_type(method, options)
-        input_type = :datepicker if input_type == :date_select
+
+        if input_type == :date_select && active_admin_context?
+          input_type = :datepicker
+        end
+
         input_type
       end
+
+      def active_admin_context?
+        options[:builder] == ::ActiveAdmin::FormBuilder
+      rescue NameError
+        false
+      end
     end
   end
 end

data/lib/activeadmin_addons/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminAddons
-  VERSION = "1.8.3"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_addons
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Platanus
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_material