Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
45a354f8
Commit
45a354f8
authored
Jul 27, 2018
by
BaiJiangJie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
parent
a48fb9de
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
api.py
apps/perms/api.py
+3
-0
No files found.
apps/perms/api.py
View file @
45a354f8
...
@@ -14,6 +14,8 @@ from .models import AssetPermission
...
@@ -14,6 +14,8 @@ from .models import AssetPermission
from
.hands
import
AssetGrantedSerializer
,
User
,
UserGroup
,
Asset
,
Node
,
\
from
.hands
import
AssetGrantedSerializer
,
User
,
UserGroup
,
Asset
,
Node
,
\
NodeGrantedSerializer
,
SystemUser
,
NodeSerializer
NodeGrantedSerializer
,
SystemUser
,
NodeSerializer
from
.
import
serializers
from
.
import
serializers
from
orgs.utils
import
set_current_org
from
orgs.models
import
Organization
class
AssetPermissionViewSet
(
viewsets
.
ModelViewSet
):
class
AssetPermissionViewSet
(
viewsets
.
ModelViewSet
):
...
@@ -128,6 +130,7 @@ class UserGrantedNodesWithAssetsApi(ListAPIView):
...
@@ -128,6 +130,7 @@ class UserGrantedNodesWithAssetsApi(ListAPIView):
return
queryset
return
queryset
def
get_permissions
(
self
):
def
get_permissions
(
self
):
set_current_org
(
Organization
.
root
())
if
self
.
kwargs
.
get
(
'pk'
)
is
None
:
if
self
.
kwargs
.
get
(
'pk'
)
is
None
:
self
.
permission_classes
=
(
IsValidUser
,)
self
.
permission_classes
=
(
IsValidUser
,)
return
super
()
.
get_permissions
()
return
super
()
.
get_permissions
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment