Merge pull request #91 from golony6449/devdev

후원사 영문설명, 발표자님 프로필 이미지를 위한 필드 추가

Author: golony6449

.gitignore

@@ -130,12 +130,6 @@ dmypy.json
 /.idea/
 /requirements_dev.txt
 
-# Migrations
-/pyconweb2022/sponsor/migrations/
-/pyconweb2022/program/migrations/
-/pyconweb2022/pyconemailer/migrations/
-/pyconweb2022/content/migrations/
-
 # to use pyconkr-secrets
 /pyconweb2022/zappa_settings.json
 

pyconweb2022/program/migrations/0002_proposal_speaker_profile_img_alter_proposal_language.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.0.2 on 2022-09-15 22:15
+
+from django.db import migrations, models
+import program.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("program", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="proposal",
+            name="speaker_profile_img",
+            field=models.ImageField(
+                blank=True,
+                help_text="발표자님 프로필 사진",
+                null=True,
+                upload_to=program.models.profile_img_upload_to,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="language",
+            field=models.CharField(
+                choices=[("", "---------"), ("K", "한글"), ("E", "영어")],
+                default="",
+                max_length=2,
+            ),
+        ),
+    ]

pyconweb2022/program/models.py

@@ -15,6 +15,10 @@ def __str__(self):
         return self.name
 
 
+def profile_img_upload_to(instance, filename):
+    return f"program/speaker_profile_img/{instance.id}/{filename}"
+
+
 class Proposal(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     user_name = models.CharField(max_length=100, default="")
@@ -74,6 +78,9 @@ class Proposal(models.Model):
         null=True, blank=True, help_text="파이콘 한국 유튜브에 공개되는 시간"
     )
     track_num = models.IntegerField(null=True, blank=True, help_text="트랙 번호")
+    speaker_profile_img = models.ImageField(
+        null=True, blank=True, help_text="발표자님 프로필 사진", upload_to=profile_img_upload_to
+    )
 
     # 이력관리용 필드
     created_at = models.DateTimeField(auto_now_add=True)

pyconweb2022/program/serializers.py

@@ -28,6 +28,7 @@ class Meta:
             "track_num",
             "introduction",
             "category",
+            "speaker_profile_img",
         ]
 
     def get_difficulty(self, obj: Proposal):

pyconweb2022/sponsor/admin.py

@@ -1,10 +1,12 @@
 from django.contrib import admin
 from django.db import models
-from import_export.admin import ImportExportModelAdmin
-from .models import Sponsor, SponsorLevel
 
+from sponsor.models import Sponsor, SponsorLevel
 from sponsor.resources import SponsorResource
 
+from import_export.admin import ImportExportModelAdmin
+from martor.widgets import AdminMartorWidget
+
 
 class SponsorAdmin(ImportExportModelAdmin):
     list_display = (
@@ -18,6 +20,7 @@ class SponsorAdmin(ImportExportModelAdmin):
     )
     list_filter = ("accepted",)
     ordering = ("-created_at",)
+    formfield_overrides = {models.TextField: {"widget": AdminMartorWidget}}
 
 
 admin.site.register(Sponsor, SponsorAdmin)

pyconweb2022/sponsor/migrations/0004_remove_sponsor_creator_remove_sponsor_manager_id.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.0.2 on 2022-09-12 18:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sponsor", "0003_sponsorproxymodel"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="sponsor",
+            name="creator",
+        ),
+        migrations.RemoveField(
+            model_name="sponsor",
+            name="manager_id",
+        ),
+    ]

pyconweb2022/sponsor/migrations/0005_sponsor_eng_desc.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.0.2 on 2022-09-15 22:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sponsor", "0004_remove_sponsor_creator_remove_sponsor_manager_id"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="sponsor",
+            name="eng_desc",
+            field=models.TextField(
+                blank=True, help_text="후원사 영문설명입니다. 이 설명은 홈페이지에 게시됩니다.", null=True
+            ),
+        ),
+    ]

pyconweb2022/sponsor/models.py

@@ -83,6 +83,9 @@ class Meta:
     desc = models.TextField(
         null=True, blank=True, help_text=("후원사 설명입니다. 이 설명은 홈페이지에 게시됩니다.")
     )
+    eng_desc = models.TextField(
+        null=True, blank=True, help_text=("후원사 영문설명입니다. 이 설명은 홈페이지에 게시됩니다.")
+    )
     manager_name = models.CharField(
         max_length=100, help_text=("준비위원회와 후원과 관련된 논의를 진행할 담당자의 이름을 입력해주십시오.")
     )

pyconweb2022/sponsor/serializers.py

@@ -12,4 +12,4 @@ class Meta:
 class SponsorListSerializer(ModelSerializer):
     class Meta:
         model = Sponsor
-        fields = ["slug", "name", "level", "desc", "url", "logo_image"]
+        fields = ["slug", "name", "level", "desc", "eng_desc", "url", "logo_image"]