Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c5cbbea8
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,发现更多精彩内容 >>
提交
c5cbbea8
编写于
1月 25, 2013
作者:
A
Andrey Kumanyaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rewrite admin users controller (use 1 variable and find by username)
上级
ef85202f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
24 deletion
+20
-24
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+20
-24
未找到文件。
app/controllers/admin/users_controller.rb
浏览文件 @
c5cbbea8
...
...
@@ -7,25 +7,21 @@ class Admin::UsersController < Admin::ApplicationController
end
def
show
@admin_user
=
User
.
find
(
params
[
:id
])
@projects
=
if
@admin_user
.
authorized_projects
.
empty?
projects
=
if
admin_user
.
authorized_projects
.
empty?
Project
else
Project
.
without_user
(
@
admin_user
)
Project
.
without_user
(
admin_user
)
end
.
all
end
def
team_update
@admin_user
=
User
.
find
(
params
[
:id
])
UsersProject
.
add_users_into_projects
(
params
[
:project_ids
],
[
@
admin_user
.
id
],
[
admin_user
.
id
],
params
[
:project_access
]
)
redirect_to
[
:admin
,
@
admin_user
],
notice:
'Teams were successfully updated.'
redirect_to
[
:admin
,
admin_user
],
notice:
'Teams were successfully updated.'
end
...
...
@@ -34,13 +30,11 @@ class Admin::UsersController < Admin::ApplicationController
end
def
edit
@admin_user
=
User
.
find
(
params
[
:id
])
admin_user
end
def
block
@admin_user
=
User
.
find
(
params
[
:id
])
if
@admin_user
.
block
if
admin_user
.
block
redirect_to
:back
,
alert:
"Successfully blocked"
else
redirect_to
:back
,
alert:
"Error occured. User was not blocked"
...
...
@@ -48,9 +42,7 @@ class Admin::UsersController < Admin::ApplicationController
end
def
unblock
@admin_user
=
User
.
find
(
params
[
:id
])
if
@admin_user
.
update_attribute
(
:blocked
,
false
)
if
admin_user
.
update_attribute
(
:blocked
,
false
)
redirect_to
:back
,
alert:
"Successfully unblocked"
else
redirect_to
:back
,
alert:
"Error occured. User was not unblocked"
...
...
@@ -82,30 +74,34 @@ class Admin::UsersController < Admin::ApplicationController
params
[
:user
].
delete
(
:password_confirmation
)
end
@admin_user
=
User
.
find
(
params
[
:id
])
@admin_user
.
admin
=
(
admin
&&
admin
.
to_i
>
0
)
admin_user
.
admin
=
(
admin
&&
admin
.
to_i
>
0
)
respond_to
do
|
format
|
if
@
admin_user
.
update_attributes
(
params
[
:user
],
as: :admin
)
format
.
html
{
redirect_to
[
:admin
,
@
admin_user
],
notice:
'User was successfully updated.'
}
if
admin_user
.
update_attributes
(
params
[
:user
],
as: :admin
)
format
.
html
{
redirect_to
[
:admin
,
admin_user
],
notice:
'User was successfully updated.'
}
format
.
json
{
head
:ok
}
else
format
.
html
{
render
action:
"edit"
}
format
.
json
{
render
json:
@
admin_user
.
errors
,
status: :unprocessable_entity
}
format
.
json
{
render
json:
admin_user
.
errors
,
status: :unprocessable_entity
}
end
end
end
def
destroy
@admin_user
=
User
.
find
(
params
[
:id
])
if
@admin_user
.
personal_projects
.
count
>
0
if
admin_user
.
personal_projects
.
count
>
0
redirect_to
admin_users_path
,
alert:
"User is a project owner and can't be removed."
and
return
end
@
admin_user
.
destroy
admin_user
.
destroy
respond_to
do
|
format
|
format
.
html
{
redirect_to
admin_users_
url
}
format
.
html
{
redirect_to
admin_users_
path
}
format
.
json
{
head
:ok
}
end
end
protected
def
admin_user
@admin_user
||=
User
.
find_by_username
(
params
[
:id
])
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录