tramway-admin 1.5.1 → 1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bc4c6c93969f37a2c21faddbb778af21037631ea925c39379df54d1d63e17fab
4
- data.tar.gz: ab8a12b4db1c15337dda161b8e88a6d3cc8e3e868b8c363395caaaff0fb28271
3
+ metadata.gz: 4fa0fea44dd6c194a226a07a0e3e452923729205ae2af50ca63f806ac4b27ee8
4
+ data.tar.gz: 5186616e83cf9501af64046780161d10a8fc12005d71378b8ca362ed1f1d4f83
5
5
  SHA512:
6
- metadata.gz: e601977854fa70f93bf24b614ae4a3e879c53b00a18af2d905d68077db39fdb5cf6c66872ccc3692ef98911049a5bb918f143fa30b4200fddceb05681082e848
7
- data.tar.gz: d41012dce82976665293dc9889bf3adde17e1daed2b303dba52dbae0ebf379215fd4adca6c1c71df24e174cb9edf98bd58ae94cb02fbd03ab8c85b6859021e53
6
+ metadata.gz: 5f9be9c38f89f4e06e53643132d79db09a321d07f4f99aa660487d76d46e40dea8141cf4c6040da4e08f9bb9e1ee6235ba0e060289c080cc23bd02de9c59539e
7
+ data.tar.gz: c38a90985516d236cc72c96cda96ff922de383d3ac96da8a02078dcecf9f906cae3943eea31e1c66e393409205f8b745c2ff2a04b303c10dc296ed24b6366658
@@ -21,8 +21,8 @@ module Tramway::Admin
21
21
  params[:model].constantize
22
22
  end
23
23
 
24
- def decorator_class
25
- "#{model_class}Decorator".constantize
24
+ def decorator_class(model_name = nil)
25
+ "#{model_name || model_class}Decorator".constantize
26
26
  end
27
27
 
28
28
  def get_collection(model_class)
@@ -6,7 +6,8 @@
6
6
  - when :default
7
7
  = 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)
8
8
  - when :association
9
- = 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
9
+ - full_class_name_association = form_object.class.full_class_name_association(property)
10
+ = 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 }
10
11
  - else
11
12
  = 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) }
12
13
  - else
@@ -1,5 +1,5 @@
1
1
  module Tramway
2
2
  module Admin
3
- VERSION = '1.5.1'
3
+ VERSION = '1.6'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tramway-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.1
4
+ version: '1.6'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Kalashnikov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-10-02 00:00:00.000000000 Z
11
+ date: 2018-10-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bootstrap-kaminari-views