Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a27c336e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a27c336e
编写于
7月 02, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'assignement_change_notifications' into 'master'
Assignment change notifications Fixes #1377
上级
30b72919
12f696c2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
6 deletion
+19
-6
app/services/notification_service.rb
app/services/notification_service.rb
+12
-2
app/views/notify/reassigned_issue_email.html.haml
app/views/notify/reassigned_issue_email.html.haml
+4
-1
app/views/notify/reassigned_issue_email.text.erb
app/views/notify/reassigned_issue_email.text.erb
+1
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+2
-2
未找到文件。
app/services/notification_service.rb
浏览文件 @
a27c336e
...
...
@@ -301,7 +301,9 @@ class NotificationService
end
def
reassign_resource_email
(
target
,
project
,
current_user
,
method
)
recipients
=
User
.
where
(
id:
[
target
.
assignee_id
,
target
.
assignee_id_was
])
assignee_id_was
=
previous_record
(
target
,
"assignee_id"
)
recipients
=
User
.
where
(
id:
[
target
.
assignee_id
,
assignee_id_was
])
# Add watchers to email list
recipients
=
recipients
.
concat
(
project_watchers
(
project
))
...
...
@@ -313,11 +315,19 @@ class NotificationService
recipients
.
delete
(
current_user
)
recipients
.
each
do
|
recipient
|
mailer
.
send
(
method
,
recipient
.
id
,
target
.
id
,
target
.
assignee_id_was
,
current_user
.
id
)
mailer
.
send
(
method
,
recipient
.
id
,
target
.
id
,
assignee_id_was
,
current_user
.
id
)
end
end
def
mailer
Notify
.
delay
end
def
previous_record
(
object
,
attribute
)
if
object
&&
attribute
if
object
.
previous_changes
.
include?
(
attribute
)
object
.
previous_changes
[
attribute
].
first
end
end
end
end
app/views/notify/reassigned_issue_email.html.haml
浏览文件 @
a27c336e
...
...
@@ -4,5 +4,8 @@
from
%strong
#{
@previous_assignee
.
name
}
to
%strong
#{
@issue
.
assignee_name
}
-
if
@issue
.
assignee_id
%strong
#{
@issue
.
assignee_name
}
-
else
%strong
Unassigned
app/views/notify/reassigned_issue_email.text.erb
浏览文件 @
a27c336e
...
...
@@ -2,4 +2,4 @@ Reassigned Issue <%= @issue.iid %>
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
@issue
.
assignee_name
%>
Assignee changed
<%=
"from
#{
@previous_assignee
.
name
}
"
if
@previous_assignee
%>
to
<%=
"
#{
@issue
.
assignee_id
?
@issue
.
assignee_name
:
'Unassigned'
}
"
%>
spec/services/notification_service_spec.rb
浏览文件 @
a27c336e
...
...
@@ -215,7 +215,7 @@ describe NotificationService do
end
def
should_email
(
user_id
)
Notify
.
should_receive
(
:reassigned_issue_email
).
with
(
user_id
,
issue
.
id
,
issue
.
assignee_id
,
@u_disabled
.
id
)
Notify
.
should_receive
(
:reassigned_issue_email
).
with
(
user_id
,
issue
.
id
,
nil
,
@u_disabled
.
id
)
end
def
should_not_email
(
user_id
)
...
...
@@ -279,7 +279,7 @@ describe NotificationService do
end
def
should_email
(
user_id
)
Notify
.
should_receive
(
:reassigned_merge_request_email
).
with
(
user_id
,
merge_request
.
id
,
merge_request
.
assignee_id
,
merge_request
.
author_id
)
Notify
.
should_receive
(
:reassigned_merge_request_email
).
with
(
user_id
,
merge_request
.
id
,
nil
,
merge_request
.
author_id
)
end
def
should_not_email
(
user_id
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录