From b5cac23f9d5584dd35b77dbf31cb9af5bdadc56d Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 7 Jun 2025 19:25:53 +0930 Subject: [PATCH] feat(core): Update url basename ref: #804 #797 --- app/core/serializers/ticket.py | 2 +- app/core/serializers/ticket_category.py | 2 +- app/core/serializers/ticket_depreciated.py | 2 +- app/settings/urls_api.py | 2 +- app/settings/viewsets/index.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/core/serializers/ticket.py b/app/core/serializers/ticket.py index b2ff23fc..5b70a92a 100644 --- a/app/core/serializers/ticket.py +++ b/app/core/serializers/ticket.py @@ -87,7 +87,7 @@ class ModelSerializer( url_dict.update({ 'ticketcategory': reverse( - 'v2:_api_v2_ticket_category-list', + 'v2:_api_ticketcategory-list', request=self._context['view'].request, kwargs={}, ) + '?' + ticket_type + '=true', diff --git a/app/core/serializers/ticket_category.py b/app/core/serializers/ticket_category.py index fa492f67..13bf2186 100644 --- a/app/core/serializers/ticket_category.py +++ b/app/core/serializers/ticket_category.py @@ -18,7 +18,7 @@ class TicketCategoryBaseSerializer(serializers.ModelSerializer): url = serializers.HyperlinkedIdentityField( - view_name="v2:_api_v2_ticket_category-detail", format="html" + view_name="v2:_api_ticketcategory-detail", format="html" ) class Meta: diff --git a/app/core/serializers/ticket_depreciated.py b/app/core/serializers/ticket_depreciated.py index 32addd8d..10e15419 100644 --- a/app/core/serializers/ticket_depreciated.py +++ b/app/core/serializers/ticket_depreciated.py @@ -86,7 +86,7 @@ class TicketModelSerializer( url_dict.update({ 'ticketcategory': reverse( - 'v2:_api_v2_ticket_category-list', + 'v2:_api_ticketcategory-list', request=self._context['view'].request, kwargs={}, ) + '?' + ticket_type + '=true', diff --git a/app/settings/urls_api.py b/app/settings/urls_api.py index dd332623..662210c1 100644 --- a/app/settings/urls_api.py +++ b/app/settings/urls_api.py @@ -103,7 +103,7 @@ router.register( ) router.register( prefix = 'ticket_category', - viewset = ticket_category.ViewSet, basename = '_api_v2_ticket_category' + viewset = ticket_category.ViewSet, basename = '_api_ticketcategory' ) router.register( prefix = 'ticket_comment_category', diff --git a/app/settings/viewsets/index.py b/app/settings/viewsets/index.py index 2b518a7a..fdae6e09 100644 --- a/app/settings/viewsets/index.py +++ b/app/settings/viewsets/index.py @@ -119,7 +119,7 @@ class Index(IndexViewset): "project_state": reverse('v2:_api_v2_project_state-list', request=request), "project_type": reverse('v2:_api_v2_project_type-list', request=request), "software_category": reverse('v2:_api_v2_software_category-list', request=request), - "ticket_category": reverse('v2:_api_v2_ticket_category-list', request=request), + "ticket_category": reverse('v2:_api_ticketcategory-list', request=request), "ticket_comment_category": reverse('v2:_api_v2_ticket_comment_category-list', request=request), "user_settings": reverse( 'v2:_api_v2_user_settings-detail',