Merge pull request #186 from loganmhb/author-display-name

Add Author.display_name to decide which name to display
This commit is contained in:
Mouse Reeve 2020-06-17 15:33:24 -07:00 committed by GitHub
commit 564d9627bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 4 deletions

View file

@ -184,3 +184,14 @@ class Author(FedireadsModel):
@property
def activitypub_serialize(self):
return activitypub.get_author(self)
@property
def display_name(self):
''' Helper to return a displayable name'''
if self.name:
return name
# don't want to return a spurious space if all of these are None
elif self.first_name and self.last_name:
return self.first_name + ' ' + self.last_name
else:
return self.last_name or self.first_name

View file

@ -2,7 +2,7 @@
{% load fr_display %}
{% block content %}
<div class="content-container">
<h2>{{ author.name }}</h2>
<h2>{{ author.display_name }}</h2>
{% if author.bio %}
<p>
@ -12,7 +12,7 @@
</div>
<div class="content-container">
<h2>Books by {{ author.name }}</h2>
<h2>Books by {{ author.display_name }}</h2>
<div class="book-grid row shrink wrap">
{% for book in books %}
<div class="book-preview">

View file

@ -1 +1 @@
<a href="/author/{{ book.authors.first.id }}" class="author">{{ book.authors.first.name }}</a>
<a href="/author/{{ book.authors.first.id }}" class="author">{{ book.authors.first.display_name }}</a>

View file

@ -42,7 +42,7 @@
<a href="/book/{{ book.id }}">{{ book.title }}</a>
</td>
<td>
{{ book.authors.first.name }}
{{ book.authors.first.display_name }}
</td>
<td>
{% if book.first_published_date %}{{ book.first_published_date }}{% endif %}