haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 15:53:28 +00:00
Code Issues Releases Wiki Activity

Fix useradd bug

Browse Source
This commit is contained in:
xiez
2012-07-26 17:32:51 +08:00
parent 0132e4e85d
commit e534c2a230
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
views.py
View File

@@ -1336,18 +1336,19 @@ def user_info(request, email):
def user_remove(request, user_id): def user_remove(request, user_id):
"""The user id is emailuser id.""" """The user id is emailuser id."""
if not request.user.is_staff and not request.user.org.is_staff: if not request.user.is_staff and not request.user.org['is_staff']:
raise Http404 raise Http404
ccnetuser = get_ccnetuser(userid=int(user_id)) ccnetuser = get_ccnetuser(userid=int(user_id))
if ccnetuser.org:
ccnet_threaded_rpc.remove_org_user(ccnetuser.org.org_id, ccnetuser.username)
ccnetuser.delete() ccnetuser.delete()
if request.user.is_staff: if request.user.org:
return HttpResponseRedirect(reverse('sys_useradmin')) org_id = request.user.org['org_id']
else: url_prefix = request.user.org['url_prefix']
return HttpResponseRedirect(reverse('org_useradmin')) ccnet_threaded_rpc.remove_org_user(org_id, ccnetuser.username)
return HttpResponseRedirect(reverse('org_useradmin', args=[url_prefix]))
return HttpResponseRedirect(reverse('sys_useradmin'))
@login_required @login_required
def activate_user(request, user_id): def activate_user(request, user_id):
@@ -1405,11 +1406,13 @@ def user_add(request):
if request.user.org: if request.user.org:
org_id = request.user.org['org_id'] org_id = request.user.org['org_id']
url_prefix = request.user.org['url_prefix']
ccnet_threaded_rpc.add_org_user(org_id, email, 0) ccnet_threaded_rpc.add_org_user(org_id, email, 0)
if hasattr(settings, 'EMAIL_HOST'): if hasattr(settings, 'EMAIL_HOST'):
send_user_add_mail(request, email, password) send_user_add_mail(request, email, password)
return HttpResponseRedirect(reverse('org_useradmin')) return HttpResponseRedirect(reverse('org_useradmin',
args=[url_prefix]))
else: else:
if hasattr(settings, 'EMAIL_HOST'): if hasattr(settings, 'EMAIL_HOST'):
send_user_add_mail(request, email, password) send_user_add_mail(request, email, password)