Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
48019f1a
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,发现更多精彩内容 >>
提交
48019f1a
编写于
6月 18, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update admin area with new group memberships
上级
a0b6c964
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
23 deletion
+22
-23
app/controllers/admin/groups_controller.rb
app/controllers/admin/groups_controller.rb
+1
-3
app/controllers/users_controller.rb
app/controllers/users_controller.rb
+1
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+20
-19
未找到文件。
app/controllers/admin/groups_controller.rb
浏览文件 @
48019f1a
...
...
@@ -66,14 +66,12 @@ class Admin::GroupsController < Admin::ApplicationController
end
def
project_teams_update
@group
.
add_users
_to_project_teams
(
params
[
:user_ids
].
split
(
','
),
params
[
:project
_access
])
@group
.
add_users
(
params
[
:user_ids
].
split
(
','
),
params
[
:group
_access
])
redirect_to
[
:admin
,
@group
],
notice:
'Users were successfully added.'
end
def
destroy
@group
.
truncate_teams
@group
.
destroy
redirect_to
admin_groups_path
,
notice:
'Group was successfully deleted.'
...
...
app/controllers/users_controller.rb
浏览文件 @
48019f1a
...
...
@@ -3,7 +3,7 @@ class UsersController < ApplicationController
def
show
@user
=
User
.
find_by_username!
(
params
[
:username
])
@projects
=
@user
.
authorized_projects
.
where
(
'projects.id in (?)'
,
current_user
.
authorized_projects
.
map
(
&
:id
))
@projects
=
@user
.
authorized_projects
.
where
(
'projects.id in (?)'
,
current_user
.
authorized_projects
.
map
(
&
:id
))
.
order
(
'namespace_id DESC'
)
@events
=
@user
.
recent_events
.
where
(
project_id:
@projects
.
map
(
&
:id
)).
limit
(
20
)
@title
=
@user
.
name
...
...
app/views/admin/groups/show.html.haml
浏览文件 @
48019f1a
...
...
@@ -49,10 +49,23 @@
%strong
=
@group
.
created_at
.
stamp
(
"March 1, 1999"
)
.ui-box
%h5
.title
Projects
%small
(
#{
@group
.
projects
.
count
}
)
%ul
.well-list
-
@group
.
projects
.
sort_by
(
&
:name
).
each
do
|
project
|
%li
%strong
=
link_to
project
.
name_with_namespace
,
[
:admin
,
project
]
%span
.pull-right.light
%span
.monospace
=
project
.
path_with_namespace
+
".git"
.span6
.ui-box
%h5
.title
Add user to
Group projects
:
Add user to
the group
:
.ui-box-body.form-holder
%p
.light
Read more about project permissions
...
...
@@ -64,30 +77,18 @@
%div
.prepend-top-10
=
select_tag
:project_access
,
options_for_select
(
Project
.
access_options
),
{
class:
"project-access-select chosen span2"
}
%hr
=
submit_tag
'Add user to
projects in
group'
,
class:
"btn btn-create"
=
submit_tag
'Add user to
the
group'
,
class:
"btn btn-create"
.ui-box
%h5
.title
Users from
Group projects
Users from
#{
@group
.
name
}
Group
%small
(
#{
@group
.
users
.
count
}
)
(
#{
@group
.
users
_groups
.
count
}
)
%ul
.well-list
-
@group
.
users
.
sort_by
(
&
:name
).
each
do
|
user
|
-
@group
.
users_groups
.
order
(
'group_access DESC'
).
each
do
|
member
|
-
user
=
member
.
user
%li
{
class:
dom_class
(
user
)}
%strong
=
link_to
user
.
name
,
admin_user_path
(
user
)
%span
.pull-right.light
=
pluralize
user
.
authorized_projects
.
in_namespace
(
@group
).
count
,
'project'
=
member
.
human_access
.span6
.ui-box
%h5
.title
Projects
%small
(
#{
@group
.
projects
.
count
}
)
%ul
.well-list
-
@group
.
projects
.
sort_by
(
&
:name
).
each
do
|
project
|
%li
%strong
=
link_to
project
.
name_with_namespace
,
[
:admin
,
project
]
%span
.pull-right.light
%span
.monospace
=
project
.
path_with_namespace
+
".git"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录