Skip to content

Commit cf186c6

Browse files
committed
继续使用v1的数据结构
1 parent a0ae8fc commit cf186c6

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

sql/templates/rollback.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
cardView: false, //是否显示详细视图
4343
toolbar: "#toolbar", //指明自定义的toolbar
4444
detailView: true, //是否显示父子表
45+
totalField: "count",
46+
dataField: "results",
4547
//格式化详情
4648
detailFormatter: function (index, row) {
4749
var html = [];

sql/templates/sqlworkflow.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ <h4 class="modal-title text-danger">工单日志</h4>
160160
detailView: false, //是否显示父子表
161161
locale: 'zh-CN', //本地化
162162
toolbar: "#toolbar", //指明自定义的toolbar
163+
totalField: "count",
164+
dataField: "results",
163165
queryParamsType: '',
164166
//请求服务数据时所传参数
165167
queryParams:
@@ -175,7 +177,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
175177
}
176178
return {
177179
page: params.pageNumber,
178-
page_size: params.pageSize,
180+
size: params.pageSize,
179181
status: $("#navStatus").val(),
180182
instance_id: $("#instance_id").val(),
181183
group_id: $("#group_id").val(),

sql_api/api_views/sql_workflow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from sql.models import SqlWorkflow
2121
from sql.utils.resource_group import user_groups
2222
from sql_api.filters import SqlWorkflowFilter
23-
from sql_api.pagination import BootStrapTablePagination
23+
from sql_api.pagination import CustomizedPagination, CustomizedPaginationV2
2424
from sql_api.permissions.sql_workflow import SqlWorkFlowViewPermission
2525
from sql_api.serializers.sql_workflow import (
2626
ExecuteCheckSerializer,
@@ -93,7 +93,7 @@ def post(self, request):
9393
class SqlWorkflowView(viewsets.ModelViewSet):
9494
permission_classes = [IsAuthenticated, SqlWorkFlowViewPermission]
9595
serializer_class = SqlWorkflowSerializer
96-
pagination_class = BootStrapTablePagination
96+
pagination_class = CustomizedPaginationV2
9797
filter_backends = [
9898
filters.SearchFilter,
9999
django_filters.rest_framework.DjangoFilterBackend,

sql_api/pagination.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,9 @@ def get_paginated_response(self, data):
3131
)
3232

3333

34-
class BootStrapTablePagination(PageNumberPagination):
35-
"""
36-
自定义分页器,返回bootstrap-table需要的格式
37-
"""
34+
class CustomizedPaginationV2(PageNumberPagination):
35+
"""V2的分页器"""
3836

3937
page_size = 14
40-
41-
def get_paginated_response(self, data):
42-
return Response(
43-
OrderedDict([("total", self.page.paginator.count), ("rows", data)])
44-
)
38+
page_size_query_param = "size"
39+
max_page_size = None

sql_api/permissions/sql_workflow.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
class SqlWorkFlowViewPermission(permissions.BasePermission):
1717
"""SQL工单权限校验"""
1818

19-
message = "你无权操作当前工单"
19+
message = "你没有获取工单列表的权限"
20+
obj_message = "工单状态不正确或者你没有该工单的权限"
2021

2122
def has_permission(self, request, view):
22-
self.message = "你没有获取工单列表的权限"
23+
self.message = self.message
2324
return any(
2425
[
2526
request.user.has_perm("sql.menu_sqlworkflow"),
@@ -28,15 +29,15 @@ def has_permission(self, request, view):
2829
)
2930

3031
def has_retrieve_permission(self, request, view, obj):
31-
self.message = "你无权操作当前工单"
32+
self.message = self.obj_message
3233
return can_view(request.user, obj.id)
3334

3435
def has_rollback_sql_permission(self, request, view, obj):
35-
self.message = "工单状态不正确或者你没有该工单的权限"
36+
self.message = self.obj_message
3637
return can_rollback(request.user, obj.id)
3738

3839
def has_alter_run_date_permission(self, request, view, obj):
39-
self.message = "工单状态不正确或者你没有该工单的权限"
40+
self.message = self.obj_message
4041
return Audit.can_review(request.user, obj.id, 2)
4142

4243
def has_object_permission(self, request, view, obj):

0 commit comments

Comments
 (0)