MemberActivityInfo新增数据表单字段data_fields,新增摄影师活动

FFIB 1 anno fa
parent
commit
481be2942f
2 ha cambiato i file con 32 aggiunte e 0 eliminazioni
  1. 26 0
      member/migrations/0065_auto_20240304_1043.py
  2. 6 0
      member/models.py

+ 26 - 0
member/migrations/0065_auto_20240304_1043.py

@@ -0,0 +1,26 @@
1
+# -*- coding: utf-8 -*-
2
+
3
+# Generated by Django 3.2.16 on 2024-03-04 02:43
4
+
5
+from django.db import migrations, models
6
+import jsonfield.fields
7
+
8
+
9
+class Migration(migrations.Migration):
10
+
11
+    dependencies = [
12
+        ('member', '0064_auto_20231016_1730'),
13
+    ]
14
+
15
+    operations = [
16
+        migrations.AddField(
17
+            model_name='memberactivityinfo',
18
+            name='data_fields',
19
+            field=jsonfield.fields.JSONField(blank=True, default='[]', help_text='数据字段', null=True, verbose_name='data_fields'),
20
+        ),
21
+        migrations.AlterField(
22
+            model_name='memberactivityinfo',
23
+            name='activity_section',
24
+            field=models.IntegerField(choices=[(0, 'Tamron Life'), (1, 'Tamron LRC直播课'), (2, '会员投稿'), (3, '其他'), (4, '会员投稿')], db_index=True, default=3, help_text='活动分区', verbose_name='activity_section'),
25
+        ),
26
+    ]

+ 6 - 0
member/models.py

@@ -379,6 +379,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
379 379
         (1, u'Tamron LRC直播课'),
380 380
         (2, u'会员投稿'),
381 381
         (3, u'其他'),
382
+        (4, u'会员投稿'),
382 383
     )
383 384
 
384 385
     activity_id = ShortUUIDField(_(u'activity_id'), max_length=32, blank=True, help_text=u'活动唯一标识', db_index=True, unique=True)
@@ -431,6 +432,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
431 432
     is_upload_qiniu = models.BooleanField(_(u'is_upload_qiniu'), default=False, help_text=u'是否已上传七牛')
432 433
 
433 434
     fields = JSONField(_(u'fields'), blank=True, null=True, default='[]', help_text=u'报名字段')
435
+    data_fields = JSONField(_(u'data_fields'), blank=True, null=True, default='[]', help_text=u'数据字段')
434 436
     is_series = models.BooleanField(_(u'is_series'), default=False, help_text=u'是否为系列活动')
435 437
     main_activity_id = models.CharField(_(u'main_activity_id'), max_length=32, blank=True, default='', help_text=u'系列活动主活动唯一标识')
436 438
 
@@ -562,6 +564,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
562 564
             'poster_content': self.poster_content,
563 565
             'contribution_content_placeholder': self.contribution_content_placeholder,
564 566
             'fields': json.loads(self.fields) if self.fields else [],
567
+            'data_fields': json.loads(self.data_fields) if self.data_fields else [],
565 568
             'main_activity_id': self.main_activity_id,
566 569
             'limit_contribute_num': self.limit_contribute_num,
567 570
             'is_series': self.is_series,
@@ -607,6 +610,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
607 610
             'poster_content': self.poster_content,
608 611
             'contribution_content_placeholder': self.contribution_content_placeholder,
609 612
             'fields': json.loads(self.fields) if self.fields else [],
613
+            'data_fields': json.loads(self.data_fields) if self.data_fields else [],
610 614
             'main_activity_id': self.main_activity_id,
611 615
             'limit_contribute_num': self.limit_contribute_num,
612 616
             'is_series': self.is_series,
@@ -653,6 +657,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
653 657
             'contribution_content_placeholder': self.contribution_content_placeholder,
654 658
             'welfares': self.welfares,
655 659
             'fields': json.loads(self.fields) if self.fields else [],
660
+            'data_fields': json.loads(self.data_fields) if self.data_fields else [],
656 661
             'main_activity_id': self.main_activity_id,
657 662
             'limit_contribute_num': self.limit_contribute_num,
658 663
             'is_series': self.is_series,
@@ -704,6 +709,7 @@ class MemberActivityInfo(BaseModelMixin, BrandInfoMixin):
704 709
             'contribution_content_placeholder': self.contribution_content_placeholder,
705 710
             'welfares': self.welfares,
706 711
             'fields': json.loads(self.fields) if self.fields else [],
712
+            'data_fields': json.loads(self.data_fields) if self.data_fields else [],
707 713
             'main_activity_id': self.main_activity_id,
708 714
             'limit_contribute_num': self.limit_contribute_num,
709 715
             'is_series': self.is_series,