Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f87b76a8
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,发现更多精彩内容 >>
提交
f87b76a8
编写于
1月 22, 2013
作者:
A
Andrey Kumanyaev
提交者:
Dmitriy Zaporozhets
1月 24, 2013
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactoring user team in public section
上级
f6f414ce
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
6 deletion
+22
-6
app/controllers/teams/application_controller.rb
app/controllers/teams/application_controller.rb
+0
-2
app/controllers/teams/projects_controller.rb
app/controllers/teams/projects_controller.rb
+20
-2
app/helpers/user_teams_helper.rb
app/helpers/user_teams_helper.rb
+1
-1
app/views/teams/members/_show.html.haml
app/views/teams/members/_show.html.haml
+1
-1
未找到文件。
app/controllers/teams/application_controller.rb
浏览文件 @
f87b76a8
class
Teams::ApplicationController
<
ApplicationController
before_filter
:user_team
,
only:
[
:index
,
:show
,
:edit
,
:update
,
:destroy
,
:issues
,
:merge_requests
,
:search
,
:members
]
protected
def
user_team
...
...
app/controllers/teams/projects_controller.rb
浏览文件 @
f87b76a8
class
Teams::ProjectsController
<
Teams
::
ApplicationController
def
index
@projects
=
@
user_team
.
projects
@avaliable_projects
=
current_user
.
admin?
?
Project
.
without_team
(
@
user_team
)
:
(
Project
.
personal
(
current_user
)
+
current_user
.
projects
).
uniq
@projects
=
user_team
.
projects
@avaliable_projects
=
current_user
.
admin?
?
Project
.
without_team
(
user_team
)
:
(
Project
.
personal
(
current_user
)
+
current_user
.
projects
).
uniq
end
def
new
@projects
=
Project
.
scoped
@projects
=
@projects
.
without_team
(
user_team
)
if
user_team
.
projects
.
any?
#@projects.reject!(&:empty_repo?)
end
def
create
unless
params
[
:project_ids
].
blank?
project_ids
=
params
[
:project_ids
]
access
=
params
[
:greatest_project_access
]
user_team
.
assign_to_projects
(
project_ids
,
access
)
end
redirect_to
admin_team_path
(
user_team
),
notice:
'Projects was successfully added.'
end
def
edit
@user_team
=
user_team
end
def
update
if
user_team
.
update_project_access
(
project
,
params
[
:greatest_project_access
])
redirect_to
admin_team_path
(
user_team
),
notice:
'Membership was successfully updated.'
else
render
:edit
end
end
def
destroy
user_team
.
resign_from_project
(
project
)
redirect_to
admin_team_path
(
user_team
),
notice:
'Project was successfully removed.'
end
end
app/helpers/user_teams_helper.rb
浏览文件 @
f87b76a8
...
...
@@ -19,7 +19,7 @@ module UserTeamsHelper
team
.
user_team_user_relationships
.
sort_by
(
&
:permission
).
reverse
.
group_by
(
&
:permission
)
end
def
remove_from_team_message
(
team
,
member
)
def
remove_from_
user_
team_message
(
team
,
member
)
"You are going to remove
#{
member
.
name
}
from
#{
team
.
name
}
. Are you sure?"
end
...
...
app/views/teams/members/_show.html.haml
浏览文件 @
f87b76a8
...
...
@@ -27,5 +27,5 @@
-
elsif
user
.
blocked
%span
.btn.disabled.blocked
Blocked
-
elsif
allow_admin
=
link_to
team_member_path
(
@user_team
,
user
),
confirm:
remove_from_team_message
(
@user_team
,
user
),
method: :delete
,
class:
"very_small btn danger"
do
=
link_to
team_member_path
(
@user_team
,
user
),
confirm:
remove_from_
user_
team_message
(
@user_team
,
user
),
method: :delete
,
class:
"very_small btn danger"
do
%i
.icon-minus.icon-white
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录