Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0a044c73
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,发现更多精彩内容 >>
提交
0a044c73
编写于
3月 27, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
NotificationService respects disabled notifications now
上级
ba599120
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
43 addition
and
19 deletion
+43
-19
app/services/notification_service.rb
app/services/notification_service.rb
+43
-19
未找到文件。
app/services/notification_service.rb
浏览文件 @
0a044c73
...
...
@@ -8,6 +8,9 @@
class
NotificationService
# Always notify user about ssh key added
# only if ssh key is not deploy key
#
# This is security email so it will be sent
# even if user disabled notifications
def
new_key
(
key
)
if
key
.
user
Notify
.
delay
.
new_ssh_key_email
(
key
.
id
)
...
...
@@ -21,10 +24,10 @@ class NotificationService
# * project team members with notification level higher then Participating
#
def
close_issue
(
issue
,
current_user
)
recipients
=
[
issue
.
author
,
issue
.
assignee
].
compact
.
uniq
recipients
=
reject_muted_users
([
issue
.
author
,
issue
.
assignee
])
# Dont send email to me when I close an issue
recipients
.
reject!
{
|
u
|
u
==
current_user
}
recipients
.
delete
(
current_user
)
recipients
.
each
do
|
recipient
|
Notify
.
delay
.
issue_status_changed_email
(
recipient
.
id
,
issue
.
id
,
issue
.
state
,
current_user
.
id
)
...
...
@@ -37,14 +40,7 @@ class NotificationService
# * issue new assignee if his notification level is not Disabled
#
def
reassigned_issue
(
issue
,
current_user
)
recipient_ids
=
[
issue
.
assignee_id
,
issue
.
assignee_id_was
].
compact
.
uniq
# Reject me from recipients if I reassign an issue
recipient_ids
.
reject!
{
|
id
|
id
==
current_user
.
id
}
recipient_ids
.
each
do
|
recipient_id
|
Notify
.
delay
.
reassigned_issue_email
(
recipient_id
,
issue
.
id
,
issue
.
assignee_id_was
)
end
reassign_email
(
merge_request
,
current_user
,
'reassigned_issue_email'
)
end
# When create an issue we should send next emails:
...
...
@@ -52,7 +48,11 @@ class NotificationService
# * issue assignee if his notification level is not Disabled
#
def
new_issue
(
issue
,
current_user
)
if
issue
.
assignee
&&
issue
.
assignee
!=
current_user
# skip if assignee notification disabled
return
true
if
issue
.
assignee
.
notification
.
disabled?
Notify
.
delay
.
new_issue_email
(
issue
.
id
)
end
end
...
...
@@ -63,6 +63,9 @@ class NotificationService
#
def
new_merge_request
(
merge_request
,
current_user
)
if
merge_request
.
assignee
&&
merge_request
.
assignee
!=
current_user
# skip if assignee notification disabled
return
true
if
merge_request
.
assignee
.
notification
.
disabled?
Notify
.
delay
.
new_merge_request_email
(
merge_request
.
id
)
end
end
...
...
@@ -73,12 +76,7 @@ class NotificationService
# * merge_request assignee if his notification level is not Disabled
#
def
reassigned_merge_request
(
merge_request
,
current_user
)
recipients_ids
=
merge_request
.
assignee_id_was
,
merge_request
.
assignee_id
recipients_ids
.
delete
current_user
.
id
recipients_ids
.
each
do
|
recipient_id
|
Notify
.
delay
.
reassigned_merge_request_email
(
recipient_id
,
merge_request
.
id
,
merge_request
.
assignee_id_was
)
end
reassign_email
(
merge_request
,
current_user
,
'reassigned_merge_request_email'
)
end
# Notify new user with email after creation
...
...
@@ -93,15 +91,17 @@ class NotificationService
#
def
new_note
(
note
)
if
note
.
notify
users
=
note
.
project
.
users
.
reject
{
|
u
|
u
.
id
==
note
.
author
.
id
}
users
=
note
.
project
.
users
users
=
reject_muted_users
(
users
)
users
.
delete
(
note
.
author
)
# Note: wall posts are not "attached" to anything, so fall back to "Wall"
noteable_type
=
note
.
noteable_type
.
presence
||
"Wall"
notify_method
=
"note_
#{
noteable_type
.
underscore
}
_email"
.
to_sym
if
Notify
.
respond_to?
notify_method
team_without_note_author
(
note
).
map
do
|
u
|
Notify
.
delay
.
send
(
notify_method
,
u
.
id
,
note
.
id
)
users
.
each
do
|
user
|
Notify
.
delay
.
send
(
notify_method
,
u
ser
.
id
,
note
.
id
)
end
end
elsif
note
.
notify_author
&&
note
.
commit_author
...
...
@@ -116,4 +116,28 @@ class NotificationService
def
update_team_member
(
users_project
)
Notify
.
delay
.
project_access_granted_email
(
users_project
.
id
)
end
protected
# Remove users with disabled notifications from array
# Also remove duplications and nil recipients
def
reject_muted_users
(
users
)
users
.
compact
.
uniq
.
reject
do
|
user
|
user
.
notification
.
disabled?
end
end
def
reassign_email
(
target
,
current_user
,
entity_sym
)
recipients
=
User
.
where
(
id:
[
target
.
assignee_id
,
target
.
assignee_id_was
])
# reject users with disabled notifications
recipients
=
reject_muted_users
(
recipients
)
# Reject me from recipients if I reassign an item
recipients
.
delete
(
current_user
)
recipients
.
each
do
|
recipient_id
|
Notify
.
delay
.
send
(
method
,
recipient
.
id
,
target
.
id
,
target
.
assignee_id_was
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录