brick 1.0.165 → 1.0.167
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/brick/frameworks/rails/form_tags.rb +13 -8
- data/lib/brick/version_number.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: dc6c27a0806fb3e263addc8e33b18974c93521c5cf3da264712e0188e3b010e3
|
|
4
|
+
data.tar.gz: 2dd3e67605b0a9e6300b13a00ef602bd34c9fd0dd57e4b7049c2d201a9fd5b04
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0ba147231b645bf1596997f65b0b084a39e950d9ecc4f516298664366c22c7ab1b521e6b27e57f2c4aec796cd36bc91ef0e49aa382cec14169c940ce626d3c39
|
|
7
|
+
data.tar.gz: 8cc67c037362574ff41ed8c2d0a644975c222d3ce9d5b41e813158a3d389e69395f613d994e894ee1c078c1f96205e073b63c65b7e4f5700dee94addb1a24b61
|
|
@@ -61,29 +61,34 @@ module Brick::Rails::FormTags
|
|
|
61
61
|
end
|
|
62
62
|
sequence.reject! { |nm| exclusions.include?(nm) } if exclusions
|
|
63
63
|
out << sequence.each_with_object(+'') do |col_name, s|
|
|
64
|
-
s << '<th
|
|
64
|
+
s << '<th'
|
|
65
65
|
if (col = cols[col_name]).is_a?(ActiveRecord::ConnectionAdapters::Column)
|
|
66
|
-
s << "title=\"#{col.comment}\"
|
|
66
|
+
s << " title=\"#{col.comment}\"" if col.respond_to?(:comment) && !col.comment.blank?
|
|
67
67
|
s << if (bt = bts[col_name])
|
|
68
68
|
# Allow sorting for any BT except polymorphics
|
|
69
|
-
x_order = "x-order=\"#{bt.first
|
|
69
|
+
x_order = " x-order=\"#{bt.first}\"" unless bt[2]
|
|
70
70
|
"#{x_order}>BT #{bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')}"
|
|
71
71
|
else # Normal column
|
|
72
72
|
col_name_humanised = klass.human_attribute_name(col_name, { default: col_name })
|
|
73
|
-
"x-order=\"#{col_name
|
|
73
|
+
x_order = " x-order=\"#{col_name}\"" if true
|
|
74
|
+
"#{x_order}>#{col_name_humanised}"
|
|
74
75
|
end
|
|
75
76
|
elsif col # HM column
|
|
76
77
|
options = {}
|
|
77
78
|
options[col[1].inheritance_column] = col[1].name unless col[1] == col[1].base_class
|
|
78
|
-
|
|
79
|
+
x_order = " x-order=\"#{col_name}\"" if true
|
|
80
|
+
s << "#{x_order}>#{col[2]} "
|
|
79
81
|
s << (col.first ? "#{col[3]}" : "#{link_to(col[3], send("#{col[1]._brick_index}_path", options))}")
|
|
80
82
|
elsif cust_cols.key?(col_name) # Custom column
|
|
81
|
-
|
|
83
|
+
x_order = " x-order=\"#{col_name}\"" if true
|
|
84
|
+
s << "#{x_order}>#{col_name}"
|
|
82
85
|
elsif col_name.is_a?(Symbol) && (hot = bts[col_name]) # has_one :through
|
|
83
|
-
|
|
86
|
+
x_order = " x-order=\"#{hot.first}\"" if true
|
|
87
|
+
s << "#{x_order}>HOT " +
|
|
84
88
|
hot[1].map { |hot_pair| hot_pair.first.bt_link(col_name) }.join(' ')
|
|
85
89
|
elsif (bt = composite_bt_names[col_name])
|
|
86
|
-
|
|
90
|
+
x_order = " x-order=\"#{bt.first}\"" unless bt[2]
|
|
91
|
+
s << "#{x_order}>BT comp " +
|
|
87
92
|
bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')
|
|
88
93
|
else # Bad column name!
|
|
89
94
|
s << "title=\"<< Unknown column >>\">#{col_name}"
|
data/lib/brick/version_number.rb
CHANGED