Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
466b922e
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
466b922e
编写于
5月 16, 2019
作者:
baltery
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
上级
9e52579c
1ca1e519
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
3 deletion
+5
-3
apps/assets/api/node.py
apps/assets/api/node.py
+2
-0
apps/assets/backends/external/db.py
apps/assets/backends/external/db.py
+1
-1
apps/assets/backends/internal/admin_user.py
apps/assets/backends/internal/admin_user.py
+1
-1
apps/assets/backends/internal/system_user.py
apps/assets/backends/internal/system_user.py
+1
-1
未找到文件。
apps/assets/api/node.py
浏览文件 @
466b922e
...
...
@@ -39,6 +39,8 @@ __all__ = [
class
NodeViewSet
(
viewsets
.
ModelViewSet
):
filter_fields
=
(
'value'
,
'key'
,
)
search_fields
=
filter_fields
queryset
=
Node
.
objects
.
all
()
permission_classes
=
(
IsOrgAdmin
,)
serializer_class
=
serializers
.
NodeSerializer
...
...
apps/assets/backends/external/db.py
浏览文件 @
466b922e
...
...
@@ -11,7 +11,7 @@ class AuthBookBackend(BaseBackend):
@
classmethod
def
filter
(
cls
,
username
=
None
,
asset
=
None
,
latest
=
True
):
queryset
=
AuthBook
.
objects
.
all
()
if
username
:
if
username
is
not
None
:
queryset
=
queryset
.
filter
(
username
=
username
)
if
asset
:
queryset
=
queryset
.
filter
(
asset
=
asset
)
...
...
apps/assets/backends/internal/admin_user.py
浏览文件 @
466b922e
...
...
@@ -27,7 +27,7 @@ class AdminUserBackend(BaseBackend):
instances
=
[]
assets
=
cls
.
_get_assets
(
asset
)
for
asset
in
assets
:
if
username
and
asset
.
admin_user
.
username
!=
username
:
if
username
is
not
None
and
asset
.
admin_user
.
username
!=
username
:
continue
instance
=
construct_authbook_object
(
asset
.
admin_user
,
asset
)
instances
.
append
(
instance
)
...
...
apps/assets/backends/internal/system_user.py
浏览文件 @
466b922e
...
...
@@ -30,7 +30,7 @@ class SystemUserBackend(BaseBackend):
@
classmethod
def
_filter_system_users_by_username
(
cls
,
system_users
,
username
):
_system_users
=
cls
.
_distinct_system_users_by_username
(
system_users
)
if
username
:
if
username
is
not
None
:
_system_users
=
[
su
for
su
in
_system_users
if
username
==
su
.
username
]
return
_system_users
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录