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

[sysadmin] Fix toggle user status bug

Browse Source
This commit is contained in:
zhengxie
2014-07-18 11:52:59 +08:00
parent 790065b19c
commit e9e01fd9d5
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -29,3 +29,4 @@ notification_email.sh
send_user_notifications.sh send_user_notifications.sh
shutdown.sh shutdown.sh
cscope* cscope*
docs/_build/*

2
seahub/urls.py
View File

@@ -192,7 +192,7 @@ urlpatterns = patterns('',
url(r'^useradmin/info/(?P<email>[^/]+)/$', user_info, name='user_info'), url(r'^useradmin/info/(?P<email>[^/]+)/$', user_info, name='user_info'),
url(r'^useradmin/activate/(?P<user_id>[^/]+)/$', user_activate, name='user_activate'), url(r'^useradmin/activate/(?P<user_id>[^/]+)/$', user_activate, name='user_activate'),
url(r'^useradmin/deactivate/(?P<user_id>[^/]+)/$', user_deactivate, name='user_deactivate'), url(r'^useradmin/deactivate/(?P<user_id>[^/]+)/$', user_deactivate, name='user_deactivate'),
url(r'^useradmin/toggle_status/(?P<user_id>[^/]+)/$', user_toggle_status, name='user_toggle_status'), url(r'^useradmin/toggle_status/(?P<email>[^/]+)/$', user_toggle_status, name='user_toggle_status'),
url(r'^useradmin/toggle_role/(?P<email>[^/]+)/$', user_toggle_role, name='user_toggle_role'), url(r'^useradmin/toggle_role/(?P<email>[^/]+)/$', user_toggle_role, name='user_toggle_role'),
url(r'^useradmin/(?P<email>[^/]+)/set_quota/$', user_set_quota, name='user_set_quota'), url(r'^useradmin/(?P<email>[^/]+)/set_quota/$', user_set_quota, name='user_set_quota'),

10
seahub/views/sysadmin.py
View File

@@ -476,19 +476,23 @@ def email_user_on_activation(user):
} }
send_html_email(_(u'Your account on %s is activated') % SITE_NAME, send_html_email(_(u'Your account on %s is activated') % SITE_NAME,
'sysadmin/user_activation_email.html', c, None, [user.email]) 'sysadmin/user_activation_email.html', c, None, [user.email])
@login_required_ajax @login_required_ajax
@sys_staff_required @sys_staff_required
def user_toggle_status(request, user_id): def user_toggle_status(request, email):
content_type = 'application/json; charset=utf-8' content_type = 'application/json; charset=utf-8'
if not is_valid_username(email):
return HttpResponse(json.dumps({'success': False}), status=400,
content_type=content_type)
try: try:
user_status = int(request.GET.get('s', 0)) user_status = int(request.GET.get('s', 0))
except ValueError: except ValueError:
user_status = 0 user_status = 0
try: try:
user = User.objects.get(id=int(user_id)) user = User.objects.get(email)
user.is_active = bool(user_status) user.is_active = bool(user_status)
user.save() user.save()