From c6976d88fd2369877d580ce8ffb4f3df65eeb387 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 19 May 2025 20:32:43 +0930 Subject: [PATCH] chore(api): correct pylint errors ref: #765 --- app/access/models/entity.py | 1 - app/accounting/models/asset_base.py | 1 - app/core/models/ticket/ticket.py | 6 ------ app/core/models/ticket_base.py | 1 - app/core/models/ticket_comment_base.py | 1 - app/core/serializers/ticket_depreciated.py | 3 +-- app/itam/tasks/inventory.py | 2 -- app/project_management/viewsets/project.py | 4 ++-- 8 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/access/models/entity.py b/app/access/models/entity.py index 025533bc..89dce491 100644 --- a/app/access/models/entity.py +++ b/app/access/models/entity.py @@ -105,7 +105,6 @@ class Entity( ): return related_object.name - break return '' diff --git a/app/accounting/models/asset_base.py b/app/accounting/models/asset_base.py index dafbd0ae..45f6f701 100644 --- a/app/accounting/models/asset_base.py +++ b/app/accounting/models/asset_base.py @@ -255,7 +255,6 @@ class AssetBase( ): return related_object.name - break return '' diff --git a/app/core/models/ticket/ticket.py b/app/core/models/ticket/ticket.py index 14ecace0..862d3da8 100644 --- a/app/core/models/ticket/ticket.py +++ b/app/core/models/ticket/ticket.py @@ -1529,12 +1529,6 @@ class RelatedTickets(TenancyObject): return FeatureNotUsed - def __str__(self): - - # return '#' + str( self.id ) - - return '#' - @property def parent_object(self): diff --git a/app/core/models/ticket_base.py b/app/core/models/ticket_base.py index 4f092e17..a2bc17fa 100644 --- a/app/core/models/ticket_base.py +++ b/app/core/models/ticket_base.py @@ -780,7 +780,6 @@ class TicketBase( ): return related_object.name - break return '' diff --git a/app/core/models/ticket_comment_base.py b/app/core/models/ticket_comment_base.py index c5f2da83..6b6a081a 100644 --- a/app/core/models/ticket_comment_base.py +++ b/app/core/models/ticket_comment_base.py @@ -335,7 +335,6 @@ class TicketCommentBase( ): return related_object.name - break return '' diff --git a/app/core/serializers/ticket_depreciated.py b/app/core/serializers/ticket_depreciated.py index b8158fc2..32addd8d 100644 --- a/app/core/serializers/ticket_depreciated.py +++ b/app/core/serializers/ticket_depreciated.py @@ -232,11 +232,10 @@ class TicketModelSerializer( if self.instance.project is None: raise centurion_exception.ValidationError( - details = 'Milestones require a project', + detail = 'Milestones require a project', code = 'milestone_requires_project', ) - return False if self.instance.project.id == self.instance.milestone.project.id: diff --git a/app/itam/tasks/inventory.py b/app/itam/tasks/inventory.py index 9dbf17ef..1da154b1 100644 --- a/app/itam/tasks/inventory.py +++ b/app/itam/tasks/inventory.py @@ -448,5 +448,3 @@ def process_inventory(self, data, organization: int): logger.critical('Exception') raise Exception(e) - - return str(f'Exception Occured: {e}') diff --git a/app/project_management/viewsets/project.py b/app/project_management/viewsets/project.py index 4c4d02af..ff87548f 100644 --- a/app/project_management/viewsets/project.py +++ b/app/project_management/viewsets/project.py @@ -1,5 +1,6 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse +from access.models.tenant import Tenant from api.viewsets.common import ModelViewSet # This import only exists so that the migrations can be created @@ -9,7 +10,6 @@ from project_management.serializers.project import ( # pylint: disable=W0611: ProjectImportSerializer, ProjectModelSerializer, ProjectViewSerializer, - Organization, ) @@ -86,7 +86,7 @@ class ViewSet( ModelViewSet ): organization = int(self.request.data['organization']) - organization = Organization.objects.get( pk = organization ) + organization = Tenant.objects.get( pk = organization ) elif self.queryset: