diff --git a/seahub/templates/sysadmin/sys_user_admin_ldap_imported.html b/seahub/templates/sysadmin/sys_user_admin_ldap_imported.html index c02b9641f8..87c0d0b465 100644 --- a/seahub/templates/sysadmin/sys_user_admin_ldap_imported.html +++ b/seahub/templates/sysadmin/sys_user_admin_ldap_imported.html @@ -14,9 +14,7 @@
diff --git a/seahub/templates/sysadmin/sys_useradmin.html b/seahub/templates/sysadmin/sys_useradmin.html index e22c3252c5..6f2e4f81fb 100644 --- a/seahub/templates/sysadmin/sys_useradmin.html +++ b/seahub/templates/sysadmin/sys_useradmin.html @@ -22,8 +22,8 @@
  • {% trans "Database" %}
  • {% if have_ldap %}
  • {% trans "LDAP" %}
  • - {% endif %}
  • {% trans "LDAP(imported)" %}
  • + {% endif %}
  • {% trans "Admins" %}
  • diff --git a/seahub/templates/sysadmin/sys_useradmin_admins.html b/seahub/templates/sysadmin/sys_useradmin_admins.html index 9f2dfdb8be..e23cb58982 100644 --- a/seahub/templates/sysadmin/sys_useradmin_admins.html +++ b/seahub/templates/sysadmin/sys_useradmin_admins.html @@ -14,8 +14,8 @@
  • {% trans "Database" %}
  • {% if have_ldap %}
  • {% trans "LDAP" %}
  • - {% endif %}
  • {% trans "LDAP(imported)" %}
  • + {% endif %}
  • {% trans "Admins" %}
  • diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index 02f0744566..e9a5a6b7a3 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -428,8 +428,6 @@ def sys_user_admin_ldap_imported(request): if last_login.username == user.email: user.last_login = last_login.last_login - have_ldap = True if len(get_emailusers('LDAP', 0, 1)) > 0 else False - return render_to_response( 'sysadmin/sys_user_admin_ldap_imported.html', { 'users': users, @@ -439,7 +437,6 @@ def sys_user_admin_ldap_imported(request): 'per_page': per_page, 'page_next': page_next, 'CALC_SHARE_USAGE': CALC_SHARE_USAGE, - 'have_ldap': have_ldap, 'is_pro': is_pro_version(), }, context_instance=RequestContext(request))