Added handling for null last login on user list page

pull/4887/head
Noah B Johnson 2018-10-31 11:06:39 -05:00 zatwierdzone przez Janneke Janssen
rodzic 7842e4907b
commit 0dacda9133
4 zmienionych plików z 4 dodań i 1 usunięć

Wyświetl plik

@ -11,6 +11,7 @@ Changelog
* Added ability to run individual tests through tox (Benjamin Bach)
* Collection listings are now ordered by name (Seb Brown)
* Added `file_hash` field to documents (Karl Hobley, Dan Braghis)
* Added last login to the user overview (Noah B Johnson)
* Fix: Query objects returned from `PageQuerySet.type_q` can now be merged with `|` (Brady Moe)
* Fix: Add `rel="noopener noreferrer"` to target blank links (Anselm Bradford)
* Fix: Additional fields on custom document models now show on the multiple document upload view (Robert Rollins, Sergey Fedoseev)

Wyświetl plik

@ -332,6 +332,7 @@ Contributors
* Justin Focus
* Fedor Selitsky
* Seb Brown
* Noah B Johnson
Translators
===========

Wyświetl plik

@ -29,6 +29,7 @@ Other features
* Added ability to run individual tests through tox (Benjamin Bach)
* Collection listings are now ordered by name (Seb Brown)
* Added ``file_hash`` field to documents (Karl Hobley, Dan Braghis)
* Added last login to the user overview (Noah B Johnson)
Bug fixes
~~~~~~~~~

Wyświetl plik

@ -38,7 +38,7 @@
<td class="username" valign="top">{{ user.get_username }}</td>
<td class="level" valign="top">{% if user.is_superuser %}{% trans "Admin" %}{% endif %}</td>
<td class="status" valign="top"><div class="status-tag {% if user.is_active %}primary{% endif %}">{% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}</div></td>
<td class="human-readable-date" title="{{ user.last_login|date:"d M Y H:i" }}">{% blocktrans with time_period=user.last_login|timesince %}{{ time_period }} ago{% endblocktrans %}</td>
<td {% if user.last_login %} class="human-readable-date" title="{{ user.last_login|date:"d M Y H:i" }}"{% endif %}>{% if user.last_login %}{% blocktrans with time_period=user.last_login|timesince %}{{ time_period }} ago{% endblocktrans %}{% endif %}</td>
</tr>
{% endfor %}
</tbody>