Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
785cbb79
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,发现更多精彩内容 >>
提交
785cbb79
编写于
6月 22, 2017
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor emails service
上级
0c8e7f49
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
20 deletion
+14
-20
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+2
-6
app/controllers/profiles/emails_controller.rb
app/controllers/profiles/emails_controller.rb
+1
-3
app/models/user.rb
app/models/user.rb
+0
-2
app/services/emails/destroy_service.rb
app/services/emails/destroy_service.rb
+11
-1
lib/api/users.rb
lib/api/users.rb
+0
-8
未找到文件。
app/controllers/admin/users_controller.rb
浏览文件 @
785cbb79
...
...
@@ -136,7 +136,7 @@ class Admin::UsersController < Admin::ApplicationController
# restore username to keep form action url.
user
.
username
=
params
[
:id
]
format
.
html
{
render
"edit"
}
format
.
json
{
render
json:
result
[
:message
],
status:
result
[
:status
]
}
format
.
json
{
render
json:
[
result
[
:message
]
],
status:
result
[
:status
]
}
end
end
end
...
...
@@ -152,11 +152,7 @@ class Admin::UsersController < Admin::ApplicationController
def
remove_email
email
=
user
.
emails
.
find
(
params
[
:email_id
])
Emails
::
DestroyService
.
new
(
current_user
,
self
,
email:
email
.
email
).
execute
result
=
Users
::
UpdateService
.
new
(
current_user
,
@user
).
execute
do
|
user
|
user
.
update_secondary_emails!
end
Emails
::
DestroyService
.
new
(
current_user
,
user
,
email:
email
.
email
).
execute
respond_to
do
|
format
|
if
result
[
:status
]
==
:success
...
...
app/controllers/profiles/emails_controller.rb
浏览文件 @
785cbb79
...
...
@@ -18,9 +18,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
def
destroy
@email
=
current_user
.
emails
.
find
(
params
[
:id
])
Emails
::
DestroyService
.
new
(
self
,
self
,
email:
@email
.
email
).
execute
Users
::
UpdateService
.
new
(
current_user
,
current_user
).
execute
{
|
user
|
user
.
update_secondary_emails!
}
Emails
::
DestroyService
.
new
(
current_user
,
current_user
,
email:
@email
.
email
).
execute
respond_to
do
|
format
|
format
.
html
{
redirect_to
profile_emails_url
,
status:
302
}
...
...
app/models/user.rb
浏览文件 @
785cbb79
...
...
@@ -496,8 +496,6 @@ class User < ActiveRecord::Base
if
primary_email_record
Emails
::
DestroyService
.
new
(
self
,
self
,
email:
email
).
execute
Emails
::
CreateService
.
new
(
self
,
self
,
email:
email_was
).
execute
update_secondary_emails!
end
end
...
...
app/services/emails/destroy_service.rb
浏览文件 @
785cbb79
...
...
@@ -3,7 +3,17 @@ module Emails
def
execute
(
skip_authorization:
false
)
raise
Gitlab
::
Access
::
AccessDeniedError
unless
skip_authorization
||
can_manage_emails?
Email
.
find_by_email
(
@email
).
destroy
Email
.
find_by_email
(
@email
).
destroy
&&
update_secondary_emails!
end
private
def
update_secondary_emails!
result
=
::
Users
::
UpdateService
.
new
(
@current_user
,
@current_user
).
execute
do
|
user
|
user
.
update_secondary_emails!
end
result
[
:status
]
==
'success'
end
end
end
lib/api/users.rb
浏览文件 @
785cbb79
...
...
@@ -275,10 +275,6 @@ module API
not_found!
(
'Email'
)
unless
email
Emails
::
DestroyService
.
new
(
current_user
,
user
,
email:
email
.
email
).
execute
(
skip_authorization:
true
)
::
Users
::
UpdateService
.
new
(
current_user
,
user
).
execute
do
|
user
|
user
.
update_secondary_emails!
end
end
desc
'Delete a user. Available only for admins.'
do
...
...
@@ -509,10 +505,6 @@ module API
not_found!
(
'Email'
)
unless
email
Emails
::
DestroyService
.
new
(
current_user
,
current_user
,
email:
email
.
email
).
execute
::
Users
::
UpdateService
.
new
(
current_user
,
current_user
).
execute
do
|
user
|
user
.
update_secondary_emails!
end
end
desc
'Get a list of user activities'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录