From 996a54226505027e677250445a2db87ff6763ad9 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 5 Jun 2023 13:42:32 -0400 Subject: [PATCH] field order; show parent brief if needed --- catalog/performance/models.py | 35 ++++++++++++++++---------------- catalog/templates/item_base.html | 2 ++ 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/catalog/performance/models.py b/catalog/performance/models.py index 9f375520..c32e24e7 100644 --- a/catalog/performance/models.py +++ b/catalog/performance/models.py @@ -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", ] diff --git a/catalog/templates/item_base.html b/catalog/templates/item_base.html index 72b53282..e7bd084a 100644 --- a/catalog/templates/item_base.html +++ b/catalog/templates/item_base.html @@ -352,6 +352,8 @@
简介
{% if item.brief %}

{{ item.brief | linebreaksbr }}

+ {% elif item.parent_item.brief %} +

{{ item.parent_item.brief | linebreaksbr }}

{% else %}

暂缺

{% endif %}