activemodel_object_info 0.3.2 → 0.3.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: 57c5e5b167d779ecddc9ef0880eae2eb80a1e5a5cfea65a041900952d105e746
|
4
|
+
data.tar.gz: 305b684a599a961fd454c06a9fb234abab64def44b629fc85ea53413973f9c93
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a787ba950b878f3fc7e40955a4cc5cf50a55ad0e8c783891c74e3c0fcee8d2f9f2630bec312717bb52c13ee52c63b41ea2f61efd19da03396ace20ea7f859e6a
|
7
|
+
data.tar.gz: 2fafd8e49b9ad0e1b1a4cef8ef813f8ea0a57b1e60f23588d617bada644eb50302af6fa395ebd041aac86b2b97c8de53ae8a4e206259495ada4dc13c9185652c
|
@@ -16,7 +16,10 @@ module ActivemodelObjectInfo
|
|
16
16
|
deleted_value_valid = const_defined?(:DELETED_VALID_VALUE) ? DELETED_VALID_VALUE : 0
|
17
17
|
deleted_value_invalid = const_defined?(:DELETED_INVALID_VALUE) ? DELETED_INVALID_VALUE : 1
|
18
18
|
# 如果定义了删除标记字段则默认搜索自动排除该内容
|
19
|
-
default_scope
|
19
|
+
default_scope do
|
20
|
+
_current_model = try(:name).to_s.safe_constantize
|
21
|
+
where(deleted_field.to_sym => deleted_value_valid) if _current_model.method_defined?(deleted_field)
|
22
|
+
end
|
20
23
|
|
21
24
|
# 通用的删除过程
|
22
25
|
define_method(:delete_block) do |**options|
|