tramway-admin 1.5.1 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4c6c93969f37a2c21faddbb778af21037631ea925c39379df54d1d63e17fab
-  data.tar.gz: ab8a12b4db1c15337dda161b8e88a6d3cc8e3e868b8c363395caaaff0fb28271
+  metadata.gz: 4fa0fea44dd6c194a226a07a0e3e452923729205ae2af50ca63f806ac4b27ee8
+  data.tar.gz: 5186616e83cf9501af64046780161d10a8fc12005d71378b8ca362ed1f1d4f83
 SHA512:
-  metadata.gz: e601977854fa70f93bf24b614ae4a3e879c53b00a18af2d905d68077db39fdb5cf6c66872ccc3692ef98911049a5bb918f143fa30b4200fddceb05681082e848
-  data.tar.gz: d41012dce82976665293dc9889bf3adde17e1daed2b303dba52dbae0ebf379215fd4adca6c1c71df24e174cb9edf98bd58ae94cb02fbd03ab8c85b6859021e53
+  metadata.gz: 5f9be9c38f89f4e06e53643132d79db09a321d07f4f99aa660487d76d46e40dea8141cf4c6040da4e08f9bb9e1ee6235ba0e060289c080cc23bd02de9c59539e
+  data.tar.gz: c38a90985516d236cc72c96cda96ff922de383d3ac96da8a02078dcecf9f906cae3943eea31e1c66e393409205f8b745c2ff2a04b303c10dc296ed24b6366658

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

@@ -21,8 +21,8 @@ module Tramway::Admin
       params[:model].constantize
     end
 
-    def decorator_class
-      "#{model_class}Decorator".constantize
+    def decorator_class(model_name = nil)
+      "#{model_name || model_class}Decorator".constantize
     end
 
     def get_collection(model_class)

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

@@ -6,7 +6,8 @@
   - when :default
     = form.input property, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) }, selected: (form_object.model.send(property) || value)
   - when :association
-    = form.association property, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send("#{property}_id") || value) }, selected: (form_object.model.send("#{property}_id") || value)#, collection: property.to_s.camelize.constantize.active
+    - full_class_name_association = form_object.class.full_class_name_association(property)
+    = form.association property, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send("#{property}_id") || value) }, selected: (form_object.model.send("#{property}_id") || value), collection: full_class_name_association.active.map { |obj| decorator_class(full_class_name_association).decorate obj }
   - 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/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.5.1'
+    VERSION = '1.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: '1.6'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views