forest_admin_datasource_active_record 1.19.2 → 1.19.3
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:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fe487bebcd7633682bb2a3e4a7813ade3392cc3dce45e3c798d6ca6a39bc5c10
|
|
4
|
+
data.tar.gz: 8c9c5f6b5577e2f070dee8ed4cbc7b847e5418f847830c57fd96e055587ab8da
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: dcc80e59f12a9b3846dc545fe56088ccc90a614498cc952d69ed4c424a645db20b9c06c5db3942deaf1a195d2321dd76cc7eb3edea9a53f1ffeb65d12f6661e3
|
|
7
|
+
data.tar.gz: c4637f0dfd8109b621930f55555e58084bedca5ae7ba1c205839c8e682042eaed9452cc56297ec14f0e191a7667d14af9fe1f0bbc2a12b2c97464f02c4f89cff
|
|
@@ -43,15 +43,13 @@ module ForestAdminDatasourceActiveRecord
|
|
|
43
43
|
end
|
|
44
44
|
|
|
45
45
|
def get_enum_values(model, column)
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
end
|
|
46
|
+
return [] unless get_column_type(model, column) == 'Enum'
|
|
47
|
+
|
|
48
|
+
if sti_column?(model, column)
|
|
49
|
+
model.descendants.map(&:name)
|
|
50
|
+
else
|
|
51
|
+
model.defined_enums[column.name].keys
|
|
53
52
|
end
|
|
54
|
-
enum_values
|
|
55
53
|
end
|
|
56
54
|
|
|
57
55
|
def sti_column?(model, column)
|
|
@@ -6,7 +6,7 @@ module ForestAdminDatasourceActiveRecord
|
|
|
6
6
|
validations = []
|
|
7
7
|
# NOTICE: Do not consider validations if a before_validation Active Records
|
|
8
8
|
# Callback is detected.
|
|
9
|
-
return validations if @model._validation_callbacks.
|
|
9
|
+
return validations if @model._validation_callbacks.any? { |callback| callback.kind == :before }
|
|
10
10
|
|
|
11
11
|
if @model._validators? && @model._validators[column.name.to_sym].size.positive?
|
|
12
12
|
@model._validators[column.name.to_sym].each do |validator|
|