Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
01378ab4
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,发现更多精彩内容 >>
提交
01378ab4
编写于
6月 14, 2017
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update profiles controller to use new service
上级
59c3968c
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
21 addition
and
13 deletion
+21
-13
app/controllers/profiles_controller.rb
app/controllers/profiles_controller.rb
+18
-10
app/services/users/update_service.rb
app/services/users/update_service.rb
+3
-3
未找到文件。
app/controllers/profiles_controller.rb
浏览文件 @
01378ab4
...
...
@@ -12,39 +12,47 @@ class ProfilesController < Profiles::ApplicationController
user_params
.
except!
(
:email
)
if
@user
.
external_email?
respond_to
do
|
format
|
if
@user
.
update_attributes
(
user_params
)
status
=
Users
::
UpdateService
.
new
(
current_user
,
@user
,
user_params
).
execute
if
status
[
:success
]
message
=
"Profile was successfully updated"
format
.
html
{
redirect_back_or_default
(
default:
{
action:
'show'
},
options:
{
notice:
message
})
}
format
.
json
{
render
json:
{
message:
message
}
}
else
message
=
@user
.
errors
.
full_messages
.
uniq
.
join
(
'. '
)
format
.
html
{
redirect_back_or_default
(
default:
{
action:
'show'
},
options:
{
alert:
"Failed to update profile.
#{
message
}
"
})
}
format
.
json
{
render
json:
{
message:
message
},
status: :unprocessable_entity
}
format
.
html
{
redirect_back_or_default
(
default:
{
action:
'show'
},
options:
{
alert:
status
[
:message
]
})
}
format
.
json
{
render
json:
status
}
end
end
end
def
reset_private_token
if
current_user
.
reset_authentication_token!
flash
[
:notice
]
=
"Private token was successfully reset"
Users
::
UpdateService
.
new
(
current_user
,
@user
).
execute!
(
skip_authorization:
true
)
do
|
user
|
user
.
reset_authentication_token!
end
flash
[
:notice
]
=
"Private token was successfully reset"
redirect_to
profile_account_path
end
def
reset_incoming_email_token
if
current_user
.
reset_incoming_email_token!
flash
[
:notice
]
=
"Incoming email token was successfully reset"
Users
::
UpdateService
.
new
(
current_user
,
@user
).
execute!
(
skip_authorization:
true
)
do
|
user
|
user
.
reset_incoming_email_token!
end
flash
[
:notice
]
=
"Incoming email token was successfully reset"
redirect_to
profile_account_path
end
def
reset_rss_token
if
current_user
.
reset_rss_token!
flash
[
:notice
]
=
"RSS token was successfully reset"
Users
::
UpdateService
.
new
(
current_user
,
@user
).
execute!
(
skip_authorization:
true
)
do
|
user
|
user
.
reset_rss_token!
end
flash
[
:notice
]
=
"RSS token was successfully reset"
redirect_to
profile_account_path
end
...
...
app/services/users/update_service.rb
浏览文件 @
01378ab4
...
...
@@ -10,17 +10,17 @@ module Users
def
execute
(
skip_authorization:
false
,
&
block
)
assign_attributes
(
skip_authorization
,
&
block
)
if
@user
.
save
if
@user
.
save
||
!
@user
.
changed?
success
else
error
(
'User could not be updated'
)
error
(
"User could not be updated
#{
@user
.
errors
.
full_messages
.
uniq
.
join
(
'. '
)
}
"
)
end
end
def
execute!
(
skip_authorization:
false
,
&
block
)
assign_attributes
(
skip_authorization
,
&
block
)
@user
.
save!
@user
.
save!
if
@user
.
changed?
end
private
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录