diff --git a/catalog/performance/models.py b/catalog/performance/models.py index c32e24e7..c39b793d 100644 --- a/catalog/performance/models.py +++ b/catalog/performance/models.py @@ -48,6 +48,13 @@ class Performance(Item): blank=True, default=list, ) + orig_creator = jsondata.ArrayField( + verbose_name=_("原作者"), + base_field=models.CharField(blank=True, 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), @@ -112,6 +119,7 @@ class Performance(Item): "location", "director", "playwright", + "orig_creator", "composer", "choreographer", "performer", @@ -167,6 +175,13 @@ class PerformanceProduction(Item): blank=True, default=list, ) + orig_creator = jsondata.ArrayField( + verbose_name=_("原作者"), + base_field=models.CharField(blank=True, 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), @@ -223,7 +238,6 @@ class PerformanceProduction(Item): "brief", "orig_title", "other_title", - "genre", "language", "opening_date", "closing_date", @@ -231,6 +245,7 @@ class PerformanceProduction(Item): "location", "director", "playwright", + "orig_creator", "composer", "choreographer", "performer", diff --git a/catalog/templates/performance.html b/catalog/templates/performance.html index 722f6e37..f6b5d7c1 100644 --- a/catalog/templates/performance.html +++ b/catalog/templates/performance.html @@ -22,6 +22,7 @@
{% include '_people.html' with people=item.troupe role='剧团' max=5 %}
{% include '_people.html' with people=item.location role='剧院' max=5 %}
{% include '_people.html' with people=item.language role='语言' max=5 %}
+
{% include '_people.html' with people=item.orig_creator role='原作' max=5 %}
{% include '_people.html' with people=item.director role='导演' max=5 %}
{% include '_people.html' with people=item.playwright role='编剧' max=5 %}
{% include '_people.html' with people=item.performer role='演员' max=10 %}
@@ -54,6 +55,7 @@ {% include '_people.html' with people=prod.language _role='语言' max=5 %}
+ {% include '_people.html' with people=prod.orig_creator role='原作' max=2 %} {% include '_people.html' with people=prod.director role='导演' max=2 %} {% include '_people.html' with people=prod.playwright role='编剧' max=2 %} {% include '_people.html' with people=prod.performer role='演员' max=5 %} diff --git a/catalog/templates/performanceproduction.html b/catalog/templates/performanceproduction.html index 45980d1f..383713be 100644 --- a/catalog/templates/performanceproduction.html +++ b/catalog/templates/performanceproduction.html @@ -27,6 +27,7 @@
{% include '_people.html' with people=item.troupe role='剧团' max=5 %}
{% include '_people.html' with people=item.location role='剧院' max=5 %}
{% include '_people.html' with people=item.language role='语言' max=5 %}
+
{% include '_people.html' with people=item.orig_creator role='原作' max=5 %}
{% include '_people.html' with people=item.director role='导演' max=5 %}
{% include '_people.html' with people=item.playwright role='编剧' max=5 %}
{% include '_people.html' with people=item.performer role='演员' max=10 %}