Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7451bfc5
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7451bfc5
编写于
6月 25, 2013
作者:
C
Carlos Antonio da Silva
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #11096 from akalyaev/remove-unnecessary-mapping
removed unnecessary mapping for on options
上级
da8cb2ac
512f03e7
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
5 deletion
+5
-5
activerecord/lib/active_record/transactions.rb
activerecord/lib/active_record/transactions.rb
+5
-5
未找到文件。
activerecord/lib/active_record/transactions.rb
浏览文件 @
7451bfc5
...
...
@@ -245,7 +245,7 @@ def set_options_for_callbacks!(args)
if
options
.
is_a?
(
Hash
)
&&
options
[
:on
]
assert_valid_transaction_action
(
options
[
:on
])
options
[
:if
]
=
Array
(
options
[
:if
])
fire_on
=
Array
(
options
[
:on
])
.
map
(
&
:to_sym
)
fire_on
=
Array
(
options
[
:on
])
options
[
:if
]
<<
"transaction_include_any_action?(
#{
fire_on
}
)"
end
end
...
...
@@ -288,17 +288,17 @@ def rollback_active_record_state!
clear_transaction_record_state
end
# Call the
after_commit callbacks
# Call the
+after_commit+ callbacks.
#
# Ensure that it is not called if the object was never persisted (failed create),
# but call it after the commit of a destroyed object
# but call it after the commit of a destroyed object
.
def
committed!
#:nodoc:
run_callbacks
:commit
if
destroyed?
||
persisted?
ensure
clear_transaction_record_state
end
# Call the
after rollback callbacks. The restore_state
argument indicates if the record
# Call the
+after_rollback+ callbacks. The +force_restore_state+
argument indicates if the record
# state should be rolled back to the beginning or just to the last savepoint.
def
rolledback!
(
force_restore_state
=
false
)
#:nodoc:
run_callbacks
:rollback
...
...
@@ -306,7 +306,7 @@ def rolledback!(force_restore_state = false) #:nodoc:
restore_transaction_record_state
(
force_restore_state
)
end
# Add the record to the current transaction so that the
:after_rollback and :after_commit
callbacks
# Add the record to the current transaction so that the
+after_rollback+ and +after_commit+
callbacks
# can be called.
def
add_to_transaction
if
self
.
class
.
connection
.
add_transaction_record
(
self
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录