From d1ec60d4d69290a411c971a344f864656e72ff3c Mon Sep 17 00:00:00 2001 From: hinashi Date: Mon, 20 Feb 2023 18:28:23 +0900 Subject: [PATCH] Fixed entry history API for openapi generator --- entry/api_v2/urls.py | 2 +- entry/api_v2/views.py | 9 +++++---- .../src/apiclient/autogenerated/.openapi-generator/FILES | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/entry/api_v2/urls.py b/entry/api_v2/urls.py index 240be1534..fefa7fa9a 100644 --- a/entry/api_v2/urls.py +++ b/entry/api_v2/urls.py @@ -41,7 +41,7 @@ "/histories/", views.EntryAPI.as_view( { - "get": "histories", + "get": "list", } ), ), diff --git a/entry/api_v2/views.py b/entry/api_v2/views.py index f4496c769..47c2f89ec 100644 --- a/entry/api_v2/views.py +++ b/entry/api_v2/views.py @@ -51,7 +51,7 @@ def has_object_permission(self, request, view, obj): "destroy": ACLType.Writable, "restore": ACLType.Writable, "copy": ACLType.Writable, - "histories": ACLType.Readable, + "list": ACLType.Readable, # histories } if not user.has_permission(obj, permisson.get(view.action)): @@ -70,7 +70,7 @@ def get_serializer_class(self): "retrieve": EntryRetrieveSerializer, "update": EntryUpdateSerializer, "copy": EntryCopySerializer, - "histories": EntryHistoryAttributeValueSerializer, + "list": EntryHistoryAttributeValueSerializer, } return serializer.get(self.action, EntryBaseSerializer) @@ -155,7 +155,8 @@ def copy(self, request, pk): return Response({}, status=status.HTTP_200_OK) - def histories(self, request, pk): + # histories view + def list(self, request, pk): user: User = self.request.user entry: Entry = self.get_object() @@ -174,7 +175,7 @@ def histories(self, request, pk): .select_related("parent_attr") ) - return self.list(request, pk) + return super(EntryAPI, self).list(request, pk) @extend_schema( diff --git a/frontend/src/apiclient/autogenerated/.openapi-generator/FILES b/frontend/src/apiclient/autogenerated/.openapi-generator/FILES index 29c6ecf70..d815efaac 100644 --- a/frontend/src/apiclient/autogenerated/.openapi-generator/FILES +++ b/frontend/src/apiclient/autogenerated/.openapi-generator/FILES @@ -1,4 +1,3 @@ -.openapi-generator-ignore apis/AclApi.ts apis/EntityApi.ts apis/EntryApi.ts