diff --git a/catalog/performance/models.py b/catalog/performance/models.py index 61b7be5d..15566261 100644 --- a/catalog/performance/models.py +++ b/catalog/performance/models.py @@ -42,56 +42,56 @@ class Performance(Item): ) other_title = jsondata.ArrayField( verbose_name=_("其它标题"), - base_field=models.CharField(blank=True, default="", max_length=200), + base_field=models.CharField(blank=False, default="", max_length=200), null=False, blank=True, default=list, ) genre = jsondata.ArrayField( verbose_name=_("类型"), - base_field=models.CharField(blank=True, default="", max_length=200), + base_field=models.CharField(blank=False, default="", max_length=200), null=False, blank=False, default=list, ) language = jsondata.ArrayField( verbose_name=_("语言"), - base_field=models.CharField(blank=True, default="", max_length=200), + base_field=models.CharField(blank=False, default="", max_length=200), null=False, blank=True, default=list, ) director = jsondata.ArrayField( verbose_name=_("导演"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) playwright = jsondata.ArrayField( verbose_name=_("编剧"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) orig_creator = jsondata.ArrayField( verbose_name=_("原作者"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) composer = jsondata.ArrayField( verbose_name=_("作曲"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) choreographer = jsondata.ArrayField( verbose_name=_("编舞"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, @@ -105,14 +105,14 @@ class Performance(Item): ) performer = jsondata.ArrayField( verbose_name=_("表演者"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) troupe = jsondata.ArrayField( verbose_name=_("剧团"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, @@ -126,16 +126,13 @@ class Performance(Item): ) location = jsondata.ArrayField( verbose_name=_("剧场空间"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) opening_date = jsondata.CharField( - verbose_name=_("首演日期"), - max_length=100, - null=True, - blank=True, + verbose_name=_("首演日期"), max_length=100, null=True, blank=True ) closing_date = jsondata.CharField( verbose_name=_("结束日期"), max_length=100, null=True, blank=True @@ -187,49 +184,49 @@ class PerformanceProduction(Item): ) other_title = jsondata.ArrayField( verbose_name=_("其它标题"), - base_field=models.CharField(blank=True, default="", max_length=200), + base_field=models.CharField(blank=False, default="", max_length=200), null=False, blank=True, default=list, ) language = jsondata.ArrayField( verbose_name=_("语言"), - base_field=models.CharField(blank=True, default="", max_length=200), + base_field=models.CharField(blank=False, default="", max_length=200), null=False, blank=True, default=list, ) director = jsondata.ArrayField( verbose_name=_("导演"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) playwright = jsondata.ArrayField( verbose_name=_("编剧"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) orig_creator = jsondata.ArrayField( verbose_name=_("原作者"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) composer = jsondata.ArrayField( verbose_name=_("作曲"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) choreographer = jsondata.ArrayField( verbose_name=_("编舞"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, @@ -243,14 +240,14 @@ class PerformanceProduction(Item): ) performer = jsondata.ArrayField( verbose_name=_("表演者"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, ) troupe = jsondata.ArrayField( verbose_name=_("剧团"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, @@ -264,7 +261,7 @@ class PerformanceProduction(Item): ) location = jsondata.ArrayField( verbose_name=_("剧场空间"), - base_field=models.CharField(blank=True, default="", max_length=500), + base_field=models.CharField(blank=False, default="", max_length=500), null=False, blank=True, default=list, diff --git a/catalog/templates/_crew.html b/catalog/templates/_crew.html new file mode 100644 index 00000000..595ff495 --- /dev/null +++ b/catalog/templates/_crew.html @@ -0,0 +1,15 @@ +{% if people %} + + {% if role %}{{ role }}:{% endif %} + {% for p in people %} + {% if forloop.counter <= max %} + {% if not forloop.first %}、{% endif %} + {{ p.name }} + {% if p.role.strip %}({{ p.role }}){% endif %} + + {% elif forloop.last %} + 等 + {% endif %} + {% endfor %} + +{% endif %} diff --git a/catalog/templates/catalog_edit.html b/catalog/templates/catalog_edit.html index 5f2adcc5..661b1122 100644 --- a/catalog/templates/catalog_edit.html +++ b/catalog/templates/catalog_edit.html @@ -38,7 +38,10 @@
{% if item.is_deleted %}条目已被删除{% endif %} {% if item.merged_to_item %}条目已被合并{% endif %} -
+ {% csrf_token %} {{ form.media }} {{ form }} diff --git a/common/static/scss/_form.scss b/common/static/scss/_form.scss index e8d66a23..d6321dbd 100644 --- a/common/static/scss/_form.scss +++ b/common/static/scss/_form.scss @@ -12,6 +12,7 @@ color: var(--pico-secondary) !important; border: solid 1px var(--pico-secondary) !important; margin-left: 5px !important; + padding: var(--pico-form-element-spacing-horizontal) !important; } .rjf-form-row-controls {