Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apps/organization/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
from apps.organization.serializers import OrganizationSerializer
from apps.organization.services import get_owner_name_query_set
from apps.organization_setting.models import OrganizationSetting
from apps.organization_setting.serializers import OrganizationSettingSerializer
from apps.organization_setting.serializers import (
OrganizationSettingsWithCustomPagesSerializer,
)
from utils.views import OrganizationRetrieveAPIView


Expand Down Expand Up @@ -80,7 +82,7 @@ def get(self, request, slug_name):
{
"result": result,
"template": organization.template,
"setting": OrganizationSettingSerializer(setting).data
"setting": OrganizationSettingsWithCustomPagesSerializer(setting).data
if setting
else None,
},
Expand Down
15 changes: 14 additions & 1 deletion apps/organization_setting/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Meta:
}


class OrganizationConfigSerializer(OrganizationSettingSerializer):
class OrganizationSettingsExpandedSerializer(OrganizationSettingSerializer):
custom_pages = CustomPageSerializer(
source="organization.organization_custom_page",
many=True,
Expand All @@ -78,6 +78,19 @@ class Meta(OrganizationSettingSerializer.Meta):
]


class OrganizationSettingsWithCustomPagesSerializer(OrganizationSettingSerializer):
custom_pages = CustomPageSerializer(
source="organization.organization_custom_page",
many=True,
read_only=True,
)

class Meta(OrganizationSettingSerializer.Meta):
fields = OrganizationSettingSerializer.Meta.fields + [
"custom_pages",
]


class UpdateOrganizationSettingSerializer(serializers.Serializer):
id = serializers.UUIDField(read_only=True)
site_title = serializers.CharField(required=False, allow_blank=True)
Expand Down
4 changes: 2 additions & 2 deletions apps/organization_setting/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from apps.organization.models import Organization
from apps.organization_setting.models import OrganizationSetting
from apps.organization_setting.serializers import (
OrganizationConfigSerializer,
OrganizationSettingsExpandedSerializer,
UpdateOrganizationSettingSerializer,
)

Expand Down Expand Up @@ -39,7 +39,7 @@ def update(self, request, *args, **kwargs):
serializer.is_valid(raise_exception=True)
updated_instance = serializer.save()
fresh_instance = self.get_queryset().get(pk=updated_instance.pk)
response_serializer = OrganizationConfigSerializer(
response_serializer = OrganizationSettingsExpandedSerializer(
fresh_instance,
context=self.get_serializer_context(),
)
Expand Down
Loading