Add a displayname property on Users
parent
2ff65aeb55
commit
31d5b686f7
|
@ -48,7 +48,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="{% url 'users:view_user' username=station.owner.username %}">
|
<a href="{% url 'users:view_user' username=station.owner.username %}">
|
||||||
{{ station.owner.get_full_name }}
|
{{ station.owner.displayname }}
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<h2>{% avatar user 50 %} {{ user.get_full_name }} ({{ user.username }})
|
<h2>{% avatar user 50 %} {{ user.displayname }}
|
||||||
{% if user == request.user %}
|
{% if user == request.user %}
|
||||||
<div class="pull-right edit-profile-buttons">
|
<div class="pull-right edit-profile-buttons">
|
||||||
<a class="btn btn-primary" href="{% url 'users:update_user' %}">My Info</a>
|
<a class="btn btn-primary" href="{% url 'users:update_user' %}">My Info</a>
|
||||||
|
|
|
@ -18,6 +18,13 @@ class User(AbstractUser):
|
||||||
|
|
||||||
bio = models.TextField(default='', validators=[MaxLengthValidator(1000)])
|
bio = models.TextField(default='', validators=[MaxLengthValidator(1000)])
|
||||||
|
|
||||||
|
@property
|
||||||
|
def displayname(self):
|
||||||
|
if self.get_full_name():
|
||||||
|
return self.get_full_name()
|
||||||
|
else:
|
||||||
|
return self.username
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return self.username
|
return self.username
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue