Skip to content

Commit 1a7ac71

Browse files
committed
Merge branch 'main' of https://github.com/pythonkr/backend into feature/presentation-model-api
2 parents 2ce78b5 + e63ac69 commit 1a7ac71

File tree

5 files changed

+51
-3
lines changed

5 files changed

+51
-3
lines changed

app/admin_api/serializers/cms.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@ class Meta:
1515
class PageAdminSerializer(BaseAbstractSerializer, JsonSchemaSerializer, serializers.ModelSerializer):
1616
class Meta:
1717
model = Page
18-
fields = COMMON_ADMIN_FIELDS + ("title_ko", "title_en", "subtitle_ko", "subtitle_en")
18+
fields = COMMON_ADMIN_FIELDS + (
19+
"title_ko",
20+
"title_en",
21+
"subtitle_ko",
22+
"subtitle_en",
23+
"show_top_title_banner",
24+
"show_bottom_sponsor_banner",
25+
)
1926
translation_fields = ("title", "subtitle")
2027

2128

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Generated by Django 5.2 on 2025-06-03 03:06
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
dependencies = [("cms", "0006_alter_sitemap_parent_sitemap")]
8+
operations = [
9+
migrations.AddField(
10+
model_name="historicalpage",
11+
name="show_bottom_sponsor_banner",
12+
field=models.BooleanField(default=False, help_text="페이지 하단에 스폰서 배너를 표시할지 여부"),
13+
),
14+
migrations.AddField(
15+
model_name="historicalpage",
16+
name="show_top_title_banner",
17+
field=models.BooleanField(default=False, help_text="페이지 상단에 타이틀 배너를 표시할지 여부"),
18+
),
19+
migrations.AddField(
20+
model_name="page",
21+
name="show_bottom_sponsor_banner",
22+
field=models.BooleanField(default=False, help_text="페이지 하단에 스폰서 배너를 표시할지 여부"),
23+
),
24+
migrations.AddField(
25+
model_name="page",
26+
name="show_top_title_banner",
27+
field=models.BooleanField(default=False, help_text="페이지 상단에 타이틀 배너를 표시할지 여부"),
28+
),
29+
]

app/cms/models.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ class Page(BaseAbstractModel):
1717
title = models.CharField(max_length=256)
1818
subtitle = models.CharField(max_length=512)
1919

20+
show_top_title_banner = models.BooleanField(default=False, help_text="페이지 상단에 타이틀 배너를 표시할지 여부")
21+
show_bottom_sponsor_banner = models.BooleanField(
22+
default=False, help_text="페이지 하단에 스폰서 배너를 표시할지 여부"
23+
)
24+
2025
def __str__(self):
2126
return str(self.title)
2227

app/cms/serializers.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,11 @@ class PageSerializer(serializers.ModelSerializer):
2020

2121
class Meta:
2222
model = Page
23-
fields = COMMON_FIELDS + ("title", "subtitle", "css", "sections")
23+
fields = COMMON_FIELDS + (
24+
"title",
25+
"subtitle",
26+
"css",
27+
"sections",
28+
"show_top_title_banner",
29+
"show_bottom_sponsor_banner",
30+
)

app/core/util/thread_local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def get_request() -> HttpRequest | None:
2121

2222

2323
def get_current_user() -> "UserExt" | None:
24-
if request := get_request():
24+
if (request := get_request()) and hasattr(request, "user") and getattr(request.user, "is_authenticated", False):
2525
return request.user
2626

2727
if UserExt := getattr(importlib.import_module("user.models"), "UserExt", None):

0 commit comments

Comments
 (0)