Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b813a488
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 搜索 >>
未验证
提交
b813a488
编写于
11月 05, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove User#namespaces method from code
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
6424ec93
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
7 deletion
+9
-7
app/helpers/namespaces_helper.rb
app/helpers/namespaces_helper.rb
+2
-2
app/models/user.rb
app/models/user.rb
+7
-3
spec/models/user_spec.rb
spec/models/user_spec.rb
+0
-2
未找到文件。
app/helpers/namespaces_helper.rb
浏览文件 @
b813a488
module
NamespacesHelper
def
namespaces_options
(
selected
=
:current_user
,
scope
=
:default
)
groups
=
current_user
.
owned_groups
.
select
{
|
n
|
n
.
type
==
'Group'
}
users
=
current_user
.
namespaces
.
reject
{
|
n
|
n
.
type
==
'Group'
}
groups
=
current_user
.
owned_groups
users
=
[
current_user
.
namespace
]
group_opts
=
[
"Groups"
,
groups
.
sort_by
(
&
:human_name
).
map
{
|
g
|
[
g
.
human_name
,
g
.
id
]}
]
users_opts
=
[
"Users"
,
users
.
sort_by
(
&
:human_name
).
map
{
|
u
|
[
u
.
human_name
,
u
.
id
]}
]
...
...
app/models/user.rb
浏览文件 @
b813a488
...
...
@@ -82,8 +82,6 @@ class User < ActiveRecord::Base
has_many
:personal_projects
,
through: :namespace
,
source: :projects
has_many
:projects
,
through: :users_projects
has_many
:created_projects
,
foreign_key: :creator_id
,
class_name:
'Project'
has_many
:owned_projects
,
through: :owned_groups
,
source: :projects
has_many
:snippets
,
dependent: :destroy
,
foreign_key: :author_id
,
class_name:
"Snippet"
has_many
:users_projects
,
dependent: :destroy
...
...
@@ -258,6 +256,12 @@ class User < ActiveRecord::Base
end
end
def
owned_projects
@owned_projects
||=
begin
Project
.
where
(
namespace_id:
owned_groups
.
pluck
(
:id
).
push
(
namespace
.
id
)).
joins
(
:namespace
)
end
end
# Team membership in authorized projects
def
tm_in_authorized_projects
UsersProject
.
where
(
project_id:
authorized_projects
.
map
(
&
:id
),
user_id:
self
.
id
)
...
...
@@ -330,7 +334,7 @@ class User < ActiveRecord::Base
end
def
several_namespaces?
namespaces
.
many?
||
owned_groups
.
any?
owned_groups
.
any?
end
def
namespace_id
...
...
spec/models/user_spec.rb
浏览文件 @
b813a488
...
...
@@ -135,7 +135,6 @@ describe User do
end
it
{
@user
.
several_namespaces?
.
should
be_true
}
it
{
@user
.
namespaces
.
should
include
(
@user
.
namespace
)
}
it
{
@user
.
authorized_groups
.
should
==
[
@group
]
}
it
{
@user
.
owned_groups
.
should
==
[
@group
]
}
end
...
...
@@ -162,7 +161,6 @@ describe User do
end
it
{
@user
.
several_namespaces?
.
should
be_false
}
it
{
@user
.
namespaces
.
should
==
[
@user
.
namespace
]
}
end
describe
'blocking user'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录