field order; show parent brief if needed
This commit is contained in:
parent
aa4b862d71
commit
996a542265
2 changed files with 20 additions and 17 deletions
|
@ -106,16 +106,16 @@ class Performance(Item):
|
|||
"other_title",
|
||||
"genre",
|
||||
"language",
|
||||
"director",
|
||||
"playwright",
|
||||
"performer",
|
||||
"composer",
|
||||
"choreographer",
|
||||
"crew",
|
||||
"troupe",
|
||||
"location",
|
||||
"opening_date",
|
||||
"closing_date",
|
||||
"troupe",
|
||||
"location",
|
||||
"director",
|
||||
"playwright",
|
||||
"composer",
|
||||
"choreographer",
|
||||
"performer",
|
||||
"crew",
|
||||
"official_site",
|
||||
]
|
||||
|
||||
|
@ -123,7 +123,7 @@ class Performance(Item):
|
|||
def all_productions(self):
|
||||
return (
|
||||
self.productions.all()
|
||||
.order_by("metadata__opening_date")
|
||||
.order_by("metadata__opening_date", "title")
|
||||
.filter(is_deleted=False, merged_to_item=None)
|
||||
)
|
||||
|
||||
|
@ -223,17 +223,18 @@ class PerformanceProduction(Item):
|
|||
"brief",
|
||||
"orig_title",
|
||||
"other_title",
|
||||
"genre",
|
||||
"language",
|
||||
"director",
|
||||
"playwright",
|
||||
"performer",
|
||||
"composer",
|
||||
"choreographer",
|
||||
"crew",
|
||||
"troupe",
|
||||
"location",
|
||||
"opening_date",
|
||||
"closing_date",
|
||||
"troupe",
|
||||
"location",
|
||||
"director",
|
||||
"playwright",
|
||||
"composer",
|
||||
"choreographer",
|
||||
"performer",
|
||||
"crew",
|
||||
"official_site",
|
||||
]
|
||||
|
||||
|
|
|
@ -352,6 +352,8 @@
|
|||
<h5>简介</h5>
|
||||
{% if item.brief %}
|
||||
<p class="tldr" _="on click toggle .tldr on me">{{ item.brief | linebreaksbr }}</p>
|
||||
{% elif item.parent_item.brief %}
|
||||
<p class="tldr" _="on click toggle .tldr on me">{{ item.parent_item.brief | linebreaksbr }}</p>
|
||||
{% else %}
|
||||
<p class="empty">暂缺</p>
|
||||
{% endif %}
|
||||
|
|
Loading…
Add table
Reference in a new issue