Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6350b32a
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,体验更适合开发者的 AI 搜索 >>
提交
6350b32a
编写于
1月 25, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix security issues with teams
上级
3ddd9f75
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
7 deletion
+16
-7
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+1
-1
app/controllers/teams_controller.rb
app/controllers/teams_controller.rb
+3
-6
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-0
app/models/user.rb
app/models/user.rb
+11
-0
未找到文件。
app/controllers/dashboard_controller.rb
浏览文件 @
6350b32a
...
...
@@ -18,7 +18,7 @@ class DashboardController < ApplicationController
@projects
end
@teams
=
(
UserTeam
.
with_member
(
current_user
)
+
UserTeam
.
created_by
(
current_user
)).
uniq
@teams
=
current_user
.
authorized_teams
@projects
=
@projects
.
page
(
params
[
:page
]).
per
(
30
)
...
...
app/controllers/teams_controller.rb
浏览文件 @
6350b32a
...
...
@@ -4,11 +4,9 @@ class TeamsController < ApplicationController
before_filter
:authorize_manage_user_team!
,
only:
[
:edit
,
:update
]
before_filter
:authorize_admin_user_team!
,
only:
[
:destroy
]
layout
'user_team'
,
except:
[
:new
,
:create
]
before_filter
:user_team
,
except:
[
:new
,
:create
]
def
index
@teams
=
current_user
.
user_teams
.
order
(
'name ASC'
)
end
layout
'user_team'
,
except:
[
:new
,
:create
]
def
show
user_team
...
...
@@ -83,7 +81,6 @@ class TeamsController < ApplicationController
end
def
user_team
@team
||=
UserTeam
.
find_by_path
(
params
[
:id
])
@team
||=
current_user
.
authorized_teams
.
find_by_path
(
params
[
:id
])
end
end
app/helpers/application_helper.rb
浏览文件 @
6350b32a
...
...
@@ -74,6 +74,7 @@ module ApplicationHelper
def
search_autocomplete_source
projects
=
current_user
.
authorized_projects
.
map
{
|
p
|
{
label:
"project:
#{
p
.
name_with_namespace
}
"
,
url:
project_path
(
p
)
}
}
groups
=
current_user
.
authorized_groups
.
map
{
|
group
|
{
label:
"group:
#{
group
.
name
}
"
,
url:
group_path
(
group
)
}
}
teams
=
current_user
.
authorized_teams
.
map
{
|
team
|
{
label:
"team:
#{
team
.
name
}
"
,
url:
team_path
(
team
)
}
}
default_nav
=
[
{
label:
"My Profile"
,
url:
profile_path
},
...
...
app/models/user.rb
浏览文件 @
6350b32a
...
...
@@ -295,4 +295,15 @@ class User < ActiveRecord::Base
def
namespace_id
namespace
.
try
:id
end
def
authorized_teams
@authorized_teams
||=
begin
ids
=
[]
ids
<<
UserTeam
.
with_member
(
self
).
pluck
(
'user_teams.id'
)
ids
<<
UserTeam
.
created_by
(
self
).
pluck
(
'user_teams.id'
)
ids
.
flatten
UserTeam
.
where
(
id:
ids
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录