From 2b25e2bb026deaa2f1223a9f42afb1d6f54a3345 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 12 Nov 2024 01:43:55 +0930 Subject: [PATCH] refactor(api): set fields that are for markdown to use the markdown field ref: #248 #385 #388 nofusscomputing/centurion_erp_ui#26 --- app/api/serializers/common.py | 7 +++++++ app/assistance/serializers/knowledge_base.py | 8 ++++++++ app/core/serializers/ticket.py | 3 +++ app/core/serializers/ticket_comment.py | 4 ++++ app/project_management/serializers/project.py | 3 +++ 5 files changed, 25 insertions(+) diff --git a/app/api/serializers/common.py b/app/api/serializers/common.py index 313072a9..3033eeb2 100644 --- a/app/api/serializers/common.py +++ b/app/api/serializers/common.py @@ -1,9 +1,16 @@ + from rest_framework import serializers from core import fields as centurion_field +class CommonBaseSerializer(serializers.ModelSerializer): + + pass + + + class CommonModelSerializer(CommonBaseSerializer): model_notes = centurion_field.MarkdownField( required = False ) \ No newline at end of file diff --git a/app/assistance/serializers/knowledge_base.py b/app/assistance/serializers/knowledge_base.py index e68394b9..3fb918f1 100644 --- a/app/assistance/serializers/knowledge_base.py +++ b/app/assistance/serializers/knowledge_base.py @@ -13,6 +13,9 @@ from api.serializers import common from assistance.models.knowledge_base import KnowledgeBase from assistance.serializers.knowledge_base_category import KnowledgeBaseCategoryBaseSerializer +from core import fields as centurion_field + + class KnowledgeBaseBaseSerializer(serializers.ModelSerializer): @@ -96,6 +99,11 @@ class KnowledgeBaseModelSerializer( } + content = centurion_field.MarkdownField( required = False ) + + summary = centurion_field.MarkdownField( required = False ) + + class Meta: model = KnowledgeBase diff --git a/app/core/serializers/ticket.py b/app/core/serializers/ticket.py index 5174c27c..4eb03421 100644 --- a/app/core/serializers/ticket.py +++ b/app/core/serializers/ticket.py @@ -9,6 +9,7 @@ from app.serializers.user import UserBaseSerializer from api.exceptions import UnknownTicketType from core import exceptions as centurion_exception +from core import fields as centurion_field from core.models.ticket.ticket import Ticket from core.fields.badge import Badge, BadgeField @@ -136,6 +137,8 @@ class TicketModelSerializer(TicketBaseSerializer): return url_dict + description = centurion_field.MarkdownField( required = False ) + duration = serializers.IntegerField(source='duration_ticket', read_only=True) status_badge = BadgeField(label='Status') diff --git a/app/core/serializers/ticket_comment.py b/app/core/serializers/ticket_comment.py index 4c31902e..3a5cba04 100644 --- a/app/core/serializers/ticket_comment.py +++ b/app/core/serializers/ticket_comment.py @@ -11,6 +11,7 @@ from api.exceptions import UnknownTicketType from app.serializers.user import UserBaseSerializer from core import exceptions as centurion_exceptions +from core import fields as centurion_field from core.models.ticket.ticket_comment import Ticket, TicketComment @@ -105,6 +106,9 @@ class TicketCommentModelSerializer( return urls + body = centurion_field.MarkdownField( required = False ) + + class Meta: model = TicketComment diff --git a/app/project_management/serializers/project.py b/app/project_management/serializers/project.py index 16cf885a..24a34b6e 100644 --- a/app/project_management/serializers/project.py +++ b/app/project_management/serializers/project.py @@ -10,6 +10,8 @@ from app.serializers.user import UserBaseSerializer from access.serializers.teams import TeamBaseSerializer +from core import fields as centurion_field + from project_management.models.projects import Project from project_management.serializers.project_states import ProjectStateBaseSerializer from project_management.serializers.project_type import ProjectTypeBaseSerializer @@ -75,6 +77,7 @@ class ProjectModelSerializer(ProjectBaseSerializer): ), } + description = centurion_field.MarkdownField( required = False ) class Meta: