Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
00d9d767
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 搜索 >>
提交
00d9d767
编写于
11月 16, 2016
作者:
B
Ben Bodenmiller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix "Without projects" filter
上级
f27f9803
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
1 deletion
+24
-1
CHANGELOG.md
CHANGELOG.md
+1
-0
app/models/user.rb
app/models/user.rb
+1
-1
spec/models/user_spec.rb
spec/models/user_spec.rb
+22
-0
未找到文件。
CHANGELOG.md
浏览文件 @
00d9d767
...
...
@@ -73,6 +73,7 @@ entry.
-
Fix applying GitHub-imported labels when importing job is interrupted
-
Allow to search for user by secondary email address in the admin interface(/admin/users) !7115 (YarNayar)
-
Updated commit SHA styling on the branches page.
-
Fix "Without projects" filter. !6611 (Ben Bodenmiller)
-
Fix 404 when visit /projects page
## 8.13.5 (2016-11-08)
...
...
app/models/user.rb
浏览文件 @
00d9d767
...
...
@@ -173,7 +173,7 @@ class User < ActiveRecord::Base
scope
:external
,
->
{
where
(
external:
true
)
}
scope
:active
,
->
{
with_state
(
:active
)
}
scope
:not_in_project
,
->
(
project
)
{
project
.
users
.
present?
?
where
(
"id not in (:ids)"
,
ids:
project
.
users
.
map
(
&
:id
)
)
:
all
}
scope
:without_projects
,
->
{
where
(
'id NOT IN (SELECT DISTINCT(user_id) FROM members)'
)
}
scope
:without_projects
,
->
{
where
(
'id NOT IN (SELECT DISTINCT(user_id) FROM members
WHERE user_id IS NOT NULL AND requested_at IS NULL
)'
)
}
scope
:todo_authors
,
->
(
user_id
,
state
)
{
where
(
id:
Todo
.
where
(
user_id:
user_id
,
state:
state
).
select
(
:author_id
))
}
def
self
.
with_two_factor
...
...
spec/models/user_spec.rb
浏览文件 @
00d9d767
...
...
@@ -490,6 +490,28 @@ describe User, models: true do
end
end
describe
'.without_projects'
do
let!
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let!
(
:user
)
{
create
(
:user
)
}
let!
(
:user_without_project
)
{
create
(
:user
)
}
let!
(
:user_without_project2
)
{
create
(
:user
)
}
before
do
# add user to project
project
.
team
<<
[
user
,
:master
]
# create invite to projet
create
(
:project_member
,
:developer
,
project:
project
,
invite_token:
'1234'
,
invite_email:
'inviteduser1@example.com'
)
# create request to join project
project
.
request_access
(
user_without_project2
)
end
it
{
expect
(
User
.
without_projects
).
not_to
include
user
}
it
{
expect
(
User
.
without_projects
).
to
include
user_without_project
}
it
{
expect
(
User
.
without_projects
).
to
include
user_without_project2
}
end
describe
'.not_in_project'
do
before
do
User
.
delete_all
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录