effective_datatables 4.25.1 → 4.25.3
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6795fc15046e40e435529576eb9f7f4c3473e51c12f0a62778854d567b8abee6
|
4
|
+
data.tar.gz: a1db0bc8b76f4f47561458dc7df631ed065cb5f5734840db664b493cb2012cbe
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 16816ddfd74f48e8d6deb1ac9a2d05d665fc8c063e8865b7c7237df8cc5a1b70921472927a26d09f00e94fb65764ab3280373c857ffa7c9ebe8e6d33d9b18d54
|
7
|
+
data.tar.gz: 4b65d03eddc9bc7bf6040b069995b211747cabcfdf0ca5bff05c9337172cfd59926a7f7bcbbb3b92fb3bb27bab85775e0838a78799ff265020eb84397fe0449c
|
@@ -76,11 +76,21 @@ module Effective
|
|
76
76
|
end
|
77
77
|
)
|
78
78
|
|
79
|
-
if csv && (opts[:format] || opts[:partial])
|
80
|
-
formatted
|
81
|
-
|
82
|
-
formatted.gsub!("
|
83
|
-
formatted.gsub!("
|
79
|
+
if csv && (opts[:format] || opts[:partial]) && !formatted.frozen?
|
80
|
+
formatted.gsub!("<br>\n", ' ')
|
81
|
+
formatted.gsub!("<br> ", ' ')
|
82
|
+
formatted.gsub!("<br>", ' ')
|
83
|
+
formatted.gsub!("<br/>", ' ')
|
84
|
+
formatted.gsub!("<br />", ' ')
|
85
|
+
formatted.gsub!("\n\n", ' ')
|
86
|
+
formatted.gsub!("\n", ' ') unless formatted.include?('<')
|
87
|
+
|
88
|
+
if formatted.include?('<')
|
89
|
+
formatted.gsub!("\n", '')
|
90
|
+
formatted.gsub!("<div class='col-resource_item'>", ' ')
|
91
|
+
|
92
|
+
formatted = view.strip_tags(formatted).strip
|
93
|
+
end
|
84
94
|
end
|
85
95
|
|
86
96
|
row[index] = formatted
|
@@ -89,18 +99,18 @@ module Effective
|
|
89
99
|
end
|
90
100
|
|
91
101
|
# Must return a string
|
92
|
-
def format_column(value, column, csv: false)
|
102
|
+
def format_column(value, column, as: nil, csv: false)
|
93
103
|
return if value.nil? || (column[:resource] && value.blank?)
|
94
104
|
|
95
|
-
if value.kind_of?(Array) && column[:as]
|
105
|
+
if value.kind_of?(Array) && [:string, :text].include?(column[:as])
|
96
106
|
if csv
|
97
107
|
return value.map { |v| format_column(v, column, csv: csv) }.join("\n")
|
98
108
|
else
|
99
|
-
return value.map { |v| view.content_tag(:div, format_column(v, column, csv: csv).html_safe, class: 'col-resource_item') }.join.html_safe
|
109
|
+
return value.map { |v| view.content_tag(:div, format_column(v, column, as: :string, csv: csv).html_safe, class: 'col-resource_item') }.join.html_safe
|
100
110
|
end
|
101
111
|
end
|
102
112
|
|
103
|
-
case column[:as]
|
113
|
+
case (as || column[:as])
|
104
114
|
when :actions
|
105
115
|
raise("please use actions_col instead of col(#{name}, as: :actions)")
|
106
116
|
when :boolean
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: effective_datatables
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.25.
|
4
|
+
version: 4.25.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Code and Effect
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-03-
|
11
|
+
date: 2024-03-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|