diff --git a/characters/forms.py b/characters/forms.py index a74e782..045f73b 100644 --- a/characters/forms.py +++ b/characters/forms.py @@ -8,7 +8,7 @@ from users.models import TenantUser class CharacterForm(ModelForm): class Meta: model = Character - fields = ["name", "subtitle", "description_md", "aliases", "player", "faction", "location", + fields = ["name", "description_md", "aliases", "player", "faction", "location", "archived", "color", "token_image", "large_image"] def __init__(self, *args, **kwargs): diff --git a/characters/migrations/0018_remove_character_subtitle_and_more.py b/characters/migrations/0018_remove_character_subtitle_and_more.py new file mode 100644 index 0000000..eb3e3fa --- /dev/null +++ b/characters/migrations/0018_remove_character_subtitle_and_more.py @@ -0,0 +1,21 @@ +# Generated by Django 5.0.8 on 2024-08-07 21:55 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("characters", "0017_character_linked_objects_and_more"), + ] + + operations = [ + migrations.RemoveField( + model_name="character", + name="subtitle", + ), + migrations.RemoveField( + model_name="historicalcharacter", + name="subtitle", + ), + ] diff --git a/characters/models.py b/characters/models.py index 1f7db91..a651ebb 100644 --- a/characters/models.py +++ b/characters/models.py @@ -25,7 +25,6 @@ class Character(NameSlugModel, DescriptionModel, AliasModel, HistoryModel): models.CharField(_("Nickname"), max_length=100), verbose_name=_("Aliases"), blank=True, null=True ) - subtitle = models.CharField(_("Subtitle"), max_length=100, blank=True) player = models.ForeignKey( AUTH_USER_MODEL, on_delete=models.PROTECT, blank=True, null=True, related_name="characters", verbose_name=_("Player"), @@ -82,3 +81,13 @@ class Character(NameSlugModel, DescriptionModel, AliasModel, HistoryModel): @property def graphkey(self): return f"cha{self.pk}" + + @property + def subtitle(self) -> str | None: + lines = self.description_md.splitlines() + if len(lines) == 0: + return None + first_line = lines[0] + if len(first_line) > 100: + return first_line[:100] + "…" + return first_line diff --git a/characters/templates/characters/detail.jinja b/characters/templates/characters/detail.jinja index 79b1e88..83837a8 100644 --- a/characters/templates/characters/detail.jinja +++ b/characters/templates/characters/detail.jinja @@ -38,7 +38,6 @@ {% trans %}Edit{% endtrans %} -

{{ character.subtitle }}

{% if character.aliases %}

{% trans %}Also known as:{% endtrans %}