From fb6fb61d6142dc9485a72559da573e475a0d18b6 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Wed, 30 Mar 2016 05:11:43 -0500 Subject: [PATCH] Fixed IPS4 User deletion --- services/views.py | 6 ++++-- util/context_processors.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/services/views.py b/services/views.py index 83e1384d..124efc2f 100755 --- a/services/views.py +++ b/services/views.py @@ -630,9 +630,10 @@ def reset_ips4_password(request): logger.debug("reset_ips4_password called by user %s" % request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = Ips4Manager.update_user_password(authinfo.ips4_username) + member_id = Ips4Manager.get_user_id(authinfo.ips4_username) # false we failed if result != "": - AuthServicesInfoManager.update_user_ips4_info(authinfo.ips4_username, result, id, request.user) + AuthServicesInfoManager.update_user_ips4_info(authinfo.ips4_username, result, member_id, request.user) logger.info("Succesfully reset IPS4 password for user %s" % request.user) return HttpResponseRedirect("/services/") logger.error("Unsuccessful attempt to reset IPS4 password for user %s" % request.user) @@ -652,8 +653,9 @@ def set_ips4_password(request): logger.debug("Form contains password of length %s" % len(password)) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) result = Ips4Manager.update_custom_password(authinfo.ips4_username, plain_password=password) + member_id = Ips4Manager.get_user_id(authinfo.ips4_username) if result != "": - AuthServicesInfoManager.update_user_ips4_info(authinfo.ips4_username, result, authinfo.ips4_id, request.user) + AuthServicesInfoManager.update_user_ips4_info(authinfo.ips4_username, result, member_id, request.user) logger.info("Succesfully reset IPS4 password for user %s" % request.user) return HttpResponseRedirect("/services/") else: diff --git a/util/context_processors.py b/util/context_processors.py index 7bd85386..315c6424 100755 --- a/util/context_processors.py +++ b/util/context_processors.py @@ -37,15 +37,18 @@ def domain_url(request): 'ENABLE_AUTH_IPBOARD': settings.ENABLE_AUTH_IPBOARD, 'ENABLE_AUTH_TEAMSPEAK3': settings.ENABLE_AUTH_TEAMSPEAK3, 'ENABLE_AUTH_DISCORD': settings.ENABLE_AUTH_DISCORD, + 'ENABLE_AUTH_IPS4': settings.ENABLE_AUTH_IPS4, 'ENABLE_BLUE_JABBER': settings.ENABLE_BLUE_JABBER, 'ENABLE_BLUE_FORUM': settings.ENABLE_BLUE_FORUM, 'ENABLE_BLUE_MUMBLE': settings.ENABLE_BLUE_MUMBLE, 'ENABLE_BLUE_IPBOARD': settings.ENABLE_BLUE_IPBOARD, 'ENABLE_BLUE_TEAMSPEAK3': settings.ENABLE_BLUE_TEAMSPEAK3, 'ENABLE_BLUE_DISCORD': settings.ENABLE_BLUE_DISCORD, + 'ENABLE_BLUE_IPS4': settings.ENABLE_BLUE_IPS4, 'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL, 'JACK_KNIFE_URL': settings.JACK_KNIFE_URL, 'DISCORD_SERVER_ID': settings.DISCORD_SERVER_ID, 'KILLBOARD_URL': settings.KILLBOARD_URL, + 'IPS4_URL': settings.IPS4_URL, 'EXTERNAL_MEDIA_URL': settings.EXTERNAL_MEDIA_URL, 'CURRENT_UTC_TIME': timezone.now()}