diff --git a/apis_ontology/forms.py b/apis_ontology/forms.py index 295aa25..c31624f 100644 --- a/apis_ontology/forms.py +++ b/apis_ontology/forms.py @@ -37,6 +37,7 @@ class Meta: "place", "label", "alternative_names", + "tibetan_transliteration", "start", "latitude", "longitude", @@ -51,6 +52,7 @@ class PersonForm(TibscholEntityForm): field_order = [ "name", "alternative_names", + "tibetan_transliteration", "start", "end", "gender", @@ -66,6 +68,7 @@ class WorkForm(TibscholEntityForm): field_order = [ "name", "alternative_names", + "tibetan_transliteration", "original_language", "subject_vocab", "start", @@ -82,6 +85,7 @@ class InstanceForm(TibscholEntityForm): field_order = [ "name", "alternative_names", + "tibetan_transliteration", "start", "availability", "tibschol_ref", diff --git a/apis_ontology/tables.py b/apis_ontology/tables.py index e3b2a5f..8638436 100644 --- a/apis_ontology/tables.py +++ b/apis_ontology/tables.py @@ -8,6 +8,7 @@ from django.utils.safestring import mark_safe from django.utils.html import format_html import re +from .templatetags.entity_display import display_entity_name from django.db.models import OuterRef, Subquery from django.db.models import Value from django.db.models.functions import Coalesce @@ -78,7 +79,7 @@ def render_comments(self, value): ) def render_name(self, record): - return str(record) + return display_entity_name(record, getattr(self, 'request', None)) def value_name(self, record): return getattr(record, "label", getattr(record, "name", "")) @@ -218,9 +219,6 @@ class Meta(TibscholEntityMixinTable.Meta): fields = ["name"] # exclude = ["id", "desc", "view", "edit", "noduplicate", "delete"] - def render_name(self, record): - return str(record) - export_lifedate_start = tables.Column( accessor="start", verbose_name="Life date start", visible=False )