plutonium 0.19.6 → 0.19.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/plutonium/ui/table/resource.rb +7 -2
- data/lib/plutonium/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3df0f828455b7b089d1b37ded391dce4f0a6a686ffece56ed924d58a06c1186c
|
|
4
|
+
data.tar.gz: 4920459f99392f14f070d51d30261c1e7066d8edba8a4c8f9220b5f5ff74c08a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5aac0589c1a66546d09e4e86730710f18f0466701a9baa7574df3e34c4c84e9403bbed71db3eb81034f903a2be7994ad96f541d5843671a4d6aed07b67ab7f63
|
|
7
|
+
data.tar.gz: 92b2e0dc58a7a075149069227f7fa9cdc32a8ab0136ccaa61f00480d6793ea8b64304a26d27b51c18db2df8ea86e1c6a7d5ea0fbe0cf5d8a1476443fb7cab6ab
|
|
@@ -53,11 +53,16 @@ module Plutonium
|
|
|
53
53
|
|
|
54
54
|
field_options = resource_definition.defined_fields[name] ? resource_definition.defined_fields[name][:options].dup : {}
|
|
55
55
|
|
|
56
|
+
display_definition = resource_definition.defined_displays[name] || {}
|
|
57
|
+
display_options = display_definition[:options] || {}
|
|
58
|
+
|
|
56
59
|
column_definition = resource_definition.defined_columns[name] || {}
|
|
57
60
|
column_options = column_definition[:options] || {}
|
|
58
61
|
|
|
59
|
-
tag = column_options[:as] || field_options[:as]
|
|
60
|
-
|
|
62
|
+
tag = column_options[:as] || display_definition[:as] || field_options[:as]
|
|
63
|
+
display_tag_attributes = display_options.except(:wrapper, :as)
|
|
64
|
+
column_tag_attributes = column_options.except(:wrapper, :as, :align)
|
|
65
|
+
tag_attributes = display_tag_attributes.merge(column_tag_attributes)
|
|
61
66
|
tag_block = column_definition[:block] || ->(wrapped_object, key) {
|
|
62
67
|
f = wrapped_object.field(key)
|
|
63
68
|
tag ||= f.inferred_field_component
|
data/lib/plutonium/version.rb
CHANGED