1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-26 15:26:19 +00:00

User can be deleted on useradmin page

This commit is contained in:
xiez
2012-03-17 14:05:21 +08:00
parent 0633a9934d
commit b72ce1327d
3 changed files with 22 additions and 2 deletions

View File

@@ -35,7 +35,10 @@
{{ role }}<span class="small-action-link">(<a href="{{ SITE_ROOT }}useradmin/{{ user.profile.ccnet_user_id }}/role/remove/?role={{ role }}">删除</a>)</span>
{% endfor %}
</td>
<td><button class="add-role-btn" userid="{{ user.profile.ccnet_user_id }}" email="{{ user.email }}">添加角色</button></td>
<td>
<button class="add-role-btn" userid="{{ user.profile.ccnet_user_id }}" email="{{ user.email }}">添加角色</button>
<button class="remove-user-btn" userid="{{ user.profile.id }}">删除用户</button>
</td>
{% endif %}
</tr>
{% endfor %}
@@ -66,6 +69,13 @@ $(".add-role-btn").each(function(index, item) {
}
});
$(".remove-user-btn").each(function(index, item) {
item.onclick = function() {
url = "{{ SITE_ROOT }}useradmin/" + $(item).attr("userid") + "/user/remove/";
window.location.href = url;
}
});
});
</script>
{% endblock %}

View File

@@ -4,7 +4,7 @@ from django.views.generic.simple import direct_to_template
from seahub.views import root, peers, groups, myhome, \
repo, group, modify_token, remove_repo, seafadmin, useradmin, \
role_add, role_remove, activate_user, user_add
role_add, role_remove, activate_user, user_add, user_remove
# Uncomment the next two lines to enable the admin:
from django.contrib import admin
@@ -35,6 +35,7 @@ urlpatterns = patterns('',
(r'^useradmin/add/$', user_add),
(r'^useradmin/(?P<user_id>[^/]+)/role/add/$', role_add),
(r'^useradmin/(?P<user_id>[^/]+)/role/remove/$', role_remove),
(r'^useradmin/(?P<user_id>[^/]+)/user/remove/$', user_remove),
(r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user),
(r'^avatar/', include('avatar.urls')),
(r'^profile/', include('seahub.profile.urls')),

View File

@@ -227,6 +227,15 @@ def role_remove(request, user_id):
return HttpResponseRedirect(request.META['HTTP_REFERER'])
@login_required
def user_remove(request, user_id):
if not request.user.is_staff:
raise Http404
user = User.objects.get(id=user_id)
user.delete()
return HttpResponseRedirect(request.META['HTTP_REFERER'])
@login_required
def activate_user(request, user_id):