haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
lian
2015-06-27 11:02:16 +08:00
parent 85f142b0a1
commit 84d7542071
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/templates/sysadmin/sys_user_admin_ldap_imported.html
View File

@@ -14,9 +14,7 @@
<div class="tabnav ovhd">
<ul class="tabnav-tabs fleft">
<li class="tabnav-tab"><a href="{% url 'sys_useradmin' %}">{% trans "Database" %}</a></li>
{% if have_ldap %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap' %}">{% trans "LDAP" %}</a></li>
{% endif %}
<li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_useradmin_ldap_imported' %}">{% trans "LDAP(imported)" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_admins' %}">{% trans "Admins" %}</a></li>
</ul>

2
seahub/templates/sysadmin/sys_useradmin.html
View File

@@ -22,8 +22,8 @@
<li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_useradmin' %}">{% trans "Database" %}</a></li>
{% if have_ldap %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap' %}">{% trans "LDAP" %}</a></li>
{% endif %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap_imported' %}">{% trans "LDAP(imported)" %}</a></li>
{% endif %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_admins' %}">{% trans "Admins" %}</a></li>
</ul>
<div class="fright">

2
seahub/templates/sysadmin/sys_useradmin_admins.html
View File

@@ -14,8 +14,8 @@
<li class="tabnav-tab"><a href="{% url 'sys_useradmin' %}">{% trans "Database" %}</a></li>
{% if have_ldap %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap' %}">{% trans "LDAP" %}</a></li>
{% endif %}
<li class="tabnav-tab"><a href="{% url 'sys_useradmin_ldap_imported' %}">{% trans "LDAP(imported)" %}</a></li>
{% endif %}
<li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_useradmin_admins' %}">{% trans "Admins" %}</a></li>
</ul>
<button id="add-admin-btn" class="fright"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "Add admin" %}</span></button>

3
seahub/views/sysadmin.py
View File

@@ -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))