tramway-admin 1.16.1.1 → 1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91182d0d976fa56ef1257765888681c7cff2d6e0c9ac124e2aea2a9c15dcda1
-  data.tar.gz: 4297ac7eab59d61e72a52d0add35acb27b03c618c73c849a1b7bd3a232c03fa2
+  metadata.gz: 13db76bce2de75c4328a285d6dfe261d713e3d8affb341c52e415ea7980155fb
+  data.tar.gz: 72b43c637b298e8a0d6b8b5fb7c9337615976cd2b8e0d64e1d34c74714529bba
 SHA512:
-  metadata.gz: 92fa86e2d0d20f1c0aa8edd51434a9495aa4098feaf76234f3adaa0d49032d05d451584ff14ca31e26dc5d00bd1dac6f454fa22c0ea8ddcc7c528f959290a862
-  data.tar.gz: cc71301bb4fc9f2d04fa7bc272ea27c0ec6f148b7b87cec1ee671d1cd98c75f7df02a70591758f7c164b6ebea000e9d8da47aad2f6bd3266058d8819c3bfc7a5
+  metadata.gz: 6466b87e880e2574fc513590997a701ae4ebbc2837869846b0169475fdadffeefcd3285699d4b1928d3c2e5f844345e6c27d7594f4cbb949822b1a9e833f4871
+  data.tar.gz: e2d8579bda0a3e4d0b4c5ef0465836960e678d13556e7dab91ec522dd82de6a42a4799137f6e4b77cb1edc37c08bf73a4c4a5dc5f997b75c78116817e5240130

data/app/helpers/tramway/admin/inputs_helper.rb

@@ -42,6 +42,22 @@ module Tramway
           end
         }
       end
+
+      def value_from_params(model_class:, property:, type:)
+        if type.is_a? Symbol
+          case type
+          when :polymorphic_association
+            {
+              id: params.dig(model_class.to_s.underscore, property.to_s),
+              type: params.dig(model_class.to_s.underscore, "#{property}_type"),
+            }
+          else
+            params.dig(model_class.to_s.underscore, property.to_s)
+          end
+        else
+          params.dig(model_class.to_s.underscore, property.to_s)
+        end
+      end
     end
   end
 end

data/app/helpers/tramway/admin/records_helper.rb

@@ -71,5 +71,14 @@ module Tramway::Admin
       return :active if params[:scope].nil? && index == 0
       return :active if params[:search].nil? && params[:scope].to_s == tab.to_s
     end
+
+    def new_associated_record_path(object:, association:)
+      new_record_path model: association.class_name,
+        redirect: current_model_record_path(object),
+        association.options[:class_name].underscore => {
+          association.options[:as] => object.id,
+          association.type => object.class.model_name
+        }
+    end
   end
 end

data/app/views/tramway/admin/shared/_input.html.haml

@@ -1,4 +1,4 @@
-- value = params.dig(model_class.to_s.underscore, property.to_s)
+- value = value_from_params(model_class: model_class, property: property, type: type)
 - form_object = instance_variable_get "@#{object}_form"
 - if type.is_a? Symbol
   = form.label form_object.model.class.human_attribute_name property
@@ -8,8 +8,8 @@
   - when :association
     = form.association property, **association_params(form_object: form_object, property: property, value: value, object: object)
   - when :polymorphic_association
-    = form.input property, **polymorphic_association_params(object: object, form_object: form_object, property: property, value: value)
-    = form.input "#{property}_type", input_html: { name: "#{object}[#{property}_type]", id: "#{object}_#{property}_type", value: (form_object.send(property) || form_object.model.send("#{property}_type") || value) }, selected: (form_object.model.send("#{property}_type") || value)
+    = form.input property, **polymorphic_association_params(object: object, form_object: form_object, property: property, value: value[:id])
+    = form.input "#{property}_type", input_html: { name: "#{object}[#{property}_type]", id: "#{object}_#{property}_type", value: (form_object.send(property) || form_object.model.send("#{property}_type") || value[:type]) }, selected: (form_object.model.send("#{property}_type") || value[:type])
   - else
     = form.input property, as: type, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) } 
 - else

data/app/views/tramway/admin/shared/show/_associations.html.haml

@@ -3,7 +3,7 @@
     %tr
       %td
         = model_class.human_attribute_name association.name
-        = link_to fa_icon(:plus), new_record_path(model: association.class_name, redirect: current_model_record_path(object)), class: 'btn btn-primary'
+        = link_to fa_icon(:plus), new_associated_record_path(association: association, object: object), class: 'btn btn-primary'
       %td{ colspan: 2 }
         %table.table.table-striped.table-bordered
           - object.send(association.name)&.each do |association_object|

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.16.1.1'
+    VERSION = '1.17'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.16.1.1
+  version: '1.17'
 platform: ruby
 authors:
 - Pavel Kalashnikov