1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00

Merge pull request #1376 from haiwen/ldap-imported

show name/contact-email info at ldap imported page
This commit is contained in:
xiez
2016-10-18 10:46:09 +08:00
committed by GitHub
2 changed files with 5 additions and 1 deletions

View File

@@ -32,7 +32,10 @@
{% for user in users %}
<tr data-userid="{{user.email}}">
<td><a href="{% url 'user_info' user.email %}">{{ user.email }}</a>
<td>
<a href="{% url 'user_info' user.email %}">{{ user.email }}</a>
{% if user.name %}<br />{{ user.name }}{% endif %}
{% if user.contact_email %}<br />{{ user.contact_email }}{% endif %}
</td>
<td>
<div class="user-status">

View File

@@ -356,6 +356,7 @@ def sys_user_admin_ldap_imported(request):
if user.email == request.user.email:
user.is_self = True
populate_user_info(user)
_populate_user_quota_usage(user)
# populate user last login time