Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
516b4c12
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,发现更多精彩内容 >>
提交
516b4c12
编写于
6月 19, 2015
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow Admin to filter users by 2FA status
上级
e13b523c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
97 addition
and
14 deletion
+97
-14
app/models/user.rb
app/models/user.rb
+13
-4
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+8
-0
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+40
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+36
-10
未找到文件。
app/models/user.rb
浏览文件 @
516b4c12
...
...
@@ -193,11 +193,13 @@ class User < ActiveRecord::Base
mount_uploader
:avatar
,
AvatarUploader
# Scopes
scope
:admins
,
->
{
where
(
admin:
true
)
}
scope
:admins
,
->
{
where
(
admin:
true
)
}
scope
:blocked
,
->
{
with_state
(
:blocked
)
}
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
:with_two_factor
,
->
{
where
(
'otp_required_for_login IS true'
)
}
scope
:without_two_factor
,
->
{
where
(
'otp_required_for_login IS NOT true'
)
}
#
# Class methods
...
...
@@ -231,9 +233,16 @@ class User < ActiveRecord::Base
def
filter
(
filter_name
)
case
filter_name
when
"admins"
;
self
.
admins
when
"blocked"
;
self
.
blocked
when
"wop"
;
self
.
without_projects
when
'admins'
self
.
admins
when
'blocked'
self
.
blocked
when
'two_factor_disabled'
self
.
without_two_factor
when
'two_factor_enabled'
self
.
with_two_factor
when
'wop'
self
.
without_projects
else
self
.
active
end
...
...
app/views/admin/users/index.html.haml
浏览文件 @
516b4c12
...
...
@@ -13,6 +13,14 @@
=
link_to
admin_users_path
(
filter:
"admins"
)
do
Admins
%small
.pull-right
=
User
.
admins
.
count
%li
.filter-two-factor-enabled
{
class:
"#{'active' if params[:filter] == 'two_factor_enabled'}"
}
=
link_to
admin_users_path
(
filter:
'two_factor_enabled'
)
do
2FA Enabled
%small
.pull-right
=
User
.
with_two_factor
.
count
%li
.filter-two-factor-disabled
{
class:
"#{'active' if params[:filter] == 'two_factor_disabled'}"
}
=
link_to
admin_users_path
(
filter:
'two_factor_disabled'
)
do
2FA Disabled
%small
.pull-right
=
User
.
without_two_factor
.
count
%li
{
class:
"#{'active' if params[:filter] == "
blocked
"}"
}
=
link_to
admin_users_path
(
filter:
"blocked"
)
do
Blocked
...
...
spec/features/admin/admin_users_spec.rb
浏览文件 @
516b4c12
...
...
@@ -16,6 +16,46 @@ describe "Admin::Users", feature: true do
expect
(
page
).
to
have_content
(
@user
.
email
)
expect
(
page
).
to
have_content
(
@user
.
name
)
end
describe
'Two-factor Authentication filters'
do
it
'counts users who have enabled 2FA'
do
create
(
:user
,
two_factor_enabled:
true
)
visit
admin_users_path
page
.
within
(
'.filter-two-factor-enabled small'
)
do
expect
(
page
).
to
have_content
(
'1'
)
end
end
it
'filters by users who have enabled 2FA'
do
user
=
create
(
:user
,
two_factor_enabled:
true
)
visit
admin_users_path
click_link
'2FA Enabled'
expect
(
page
).
to
have_content
(
user
.
email
)
end
it
'counts users who have not enabled 2FA'
do
create
(
:user
,
two_factor_enabled:
false
)
visit
admin_users_path
page
.
within
(
'.filter-two-factor-disabled small'
)
do
expect
(
page
).
to
have_content
(
'2'
)
# Including admin
end
end
it
'filters by users who have not enabled 2FA'
do
user
=
create
(
:user
,
two_factor_enabled:
false
)
visit
admin_users_path
click_link
'2FA Disabled'
expect
(
page
).
to
have_content
(
user
.
email
)
end
end
end
describe
"GET /admin/users/new"
do
...
...
spec/models/user_spec.rb
浏览文件 @
516b4c12
...
...
@@ -308,18 +308,44 @@ describe User do
end
end
describe
'filter'
do
before
do
User
.
delete_all
@user
=
create
:user
@admin
=
create
:user
,
admin:
true
@blocked
=
create
:user
,
state: :blocked
describe
'.filter'
do
let
(
:user
)
{
double
}
it
'filters by active users by default'
do
expect
(
User
).
to
receive
(
:active
).
and_return
([
user
])
expect
(
User
.
filter
(
nil
)).
to
include
user
end
it
{
expect
(
User
.
filter
(
"admins"
)).
to
eq
([
@admin
])
}
it
{
expect
(
User
.
filter
(
"blocked"
)).
to
eq
([
@blocked
])
}
it
{
expect
(
User
.
filter
(
"wop"
)).
to
include
(
@user
,
@admin
,
@blocked
)
}
it
{
expect
(
User
.
filter
(
nil
)).
to
include
(
@user
,
@admin
)
}
it
'filters by admins'
do
expect
(
User
).
to
receive
(
:admins
).
and_return
([
user
])
expect
(
User
.
filter
(
'admins'
)).
to
include
user
end
it
'filters by blocked'
do
expect
(
User
).
to
receive
(
:blocked
).
and_return
([
user
])
expect
(
User
.
filter
(
'blocked'
)).
to
include
user
end
it
'filters by two_factor_disabled'
do
expect
(
User
).
to
receive
(
:without_two_factor
).
and_return
([
user
])
expect
(
User
.
filter
(
'two_factor_disabled'
)).
to
include
user
end
it
'filters by two_factor_enabled'
do
expect
(
User
).
to
receive
(
:with_two_factor
).
and_return
([
user
])
expect
(
User
.
filter
(
'two_factor_enabled'
)).
to
include
user
end
it
'filters by wop'
do
expect
(
User
).
to
receive
(
:without_projects
).
and_return
([
user
])
expect
(
User
.
filter
(
'wop'
)).
to
include
user
end
end
describe
:not_in_project
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录