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
3681bfc0
Commit
3681bfc0
authored
Sep 17, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修改用户组授权api
parent
82b00008
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
14 deletions
+12
-14
mixin.py
apps/perms/api/mixin.py
+11
-2
user_group_permission.py
apps/perms/api/user_group_permission.py
+1
-12
No files found.
apps/perms/api/mixin.py
View file @
3681bfc0
...
...
@@ -8,14 +8,14 @@ from assets.utils import LabelFilterMixin
from
common.permissions
import
IsValidUser
,
IsOrgAdminOrAppUser
from
common.utils
import
get_logger
from
orgs.utils
import
set_to_root_org
from
..hands
import
User
,
Asset
,
SystemUser
from
..hands
import
User
,
UserGroup
,
Asset
,
SystemUser
from
..
import
serializers
logger
=
get_logger
(
__name__
)
__all__
=
[
'UserPermissionMixin'
,
'UserPermissionMixin'
,
'UserGroupPermissionMixin'
,
]
...
...
@@ -45,6 +45,15 @@ class UserPermissionMixin:
return
super
()
.
get_permissions
()
class
UserGroupPermissionMixin
:
obj
=
None
def
get_obj
(
self
):
user_group_id
=
self
.
kwargs
.
get
(
'pk'
,
''
)
user_group
=
get_object_or_404
(
UserGroup
,
id
=
user_group_id
)
return
user_group
class
GrantAssetsMixin
(
LabelFilterMixin
):
serializer_class
=
serializers
.
AssetGrantedSerializer
...
...
apps/perms/api/user_group_permission.py
View file @
3681bfc0
# -*- coding: utf-8 -*-
#
from
django.shortcuts
import
get_object_or_404
from
..hands
import
UserGroup
from
.
import
user_permission
as
uapi
from
.mixin
import
UserGroupPermissionMixin
__all__
=
[
'UserGroupGrantedAssetsApi'
,
'UserGroupGrantedNodesApi'
,
...
...
@@ -17,15 +15,6 @@ __all__ = [
]
class
UserGroupPermissionMixin
:
obj
=
None
def
get_object
(
self
):
user_group_id
=
self
.
kwargs
.
get
(
'pk'
,
''
)
user_group
=
get_object_or_404
(
UserGroup
,
id
=
user_group_id
)
return
user_group
class
UserGroupGrantedAssetsApi
(
UserGroupPermissionMixin
,
uapi
.
UserGrantedAssetsApi
):
pass
...
...
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