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
91b3b7ce
Unverified
Commit
91b3b7ce
authored
Jul 13, 2018
by
老广
Committed by
GitHub
Jul 13, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1515 from wstart/master
授权页面分页问题
parents
76be054f
fd3df81a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
api.py
apps/perms/api.py
+4
-0
asset_permission_list.html
apps/perms/templates/perms/asset_permission_list.html
+1
-1
No files found.
apps/perms/api.py
View file @
91b3b7ce
...
...
@@ -5,6 +5,7 @@ from django.shortcuts import get_object_or_404
from
rest_framework.views
import
APIView
,
Response
from
rest_framework.generics
import
ListAPIView
,
get_object_or_404
,
RetrieveUpdateAPIView
from
rest_framework
import
viewsets
from
rest_framework.pagination
import
LimitOffsetPagination
from
common.utils
import
set_or_append_attr_bulk
,
get_object_or_none
from
users.permissions
import
IsValidUser
,
IsSuperUser
,
IsSuperUserOrAppUser
...
...
@@ -19,9 +20,12 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
"""
资产授权列表的增删改查api
"""
filter_fields
=
(
"name"
,)
search_fields
=
filter_fields
queryset
=
AssetPermission
.
objects
.
all
()
serializer_class
=
serializers
.
AssetPermissionCreateUpdateSerializer
permission_classes
=
(
IsSuperUser
,)
pagination_class
=
LimitOffsetPagination
def
get_serializer_class
(
self
):
if
self
.
action
in
(
"list"
,
'retrieve'
):
...
...
apps/perms/templates/perms/asset_permission_list.html
View file @
91b3b7ce
...
...
@@ -208,7 +208,7 @@ function initTable() {
select
:
{},
op_html
:
$
(
'#actions'
).
html
()
};
table
=
jumpserver
.
initDataTable
(
options
);
table
=
jumpserver
.
init
ServerSide
DataTable
(
options
);
return
table
}
...
...
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