Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 06:20:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct missing request arg for messages.

Browse Source 
Correct disable_service tasks to remove password check.
Addresses #557
This commit is contained in:
Adarnof 2016-10-21 13:03:38 +00:00
parent deb94c06fd
commit 04a11b113a
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
services/tasks.py
View File

@ -71,10 +71,6 @@ def disable_forum():
logger.info("Clearing %s forum username" % auth.user) logger.info("Clearing %s forum username" % auth.user)
auth.forum_username = '' auth.forum_username = ''
auth.save() auth.save()
if auth.forum_password:
logger.info("Clearing %s forum password" % auth.user)
auth.forum_password = ''
auth.save()
def disable_jabber(): def disable_jabber():
@ -87,10 +83,6 @@ def disable_jabber():
logger.info("Clearing %s jabber username" % auth.user) logger.info("Clearing %s jabber username" % auth.user)
auth.jabber_username = '' auth.jabber_username = ''
auth.save() auth.save()
if auth.jabber_password:
logger.info("Clearing %s jabber password" % auth.user)
auth.jabber_password = ''
auth.save()
def disable_mumble(): def disable_mumble():
@ -103,10 +95,6 @@ def disable_mumble():
logger.info("Clearing %s mumble username" % auth.user) logger.info("Clearing %s mumble username" % auth.user)
auth.mumble_username = '' auth.mumble_username = ''
auth.save() auth.save()
if auth.mumble_password:
logger.info("Clearing %s mumble password" % auth.user)
auth.mumble_password = ''
auth.save()
logger.info("Deleting all MumbleUser models") logger.info("Deleting all MumbleUser models")
MumbleUser.objects.all().delete() MumbleUser.objects.all().delete()
@ -123,10 +111,6 @@ def disable_ipboard():
logger.info("Clearing %s ipboard username" % auth.user) logger.info("Clearing %s ipboard username" % auth.user)
auth.ipboard_username = '' auth.ipboard_username = ''
auth.save() auth.save()
if auth.ipboard_password:
logger.info("Clearing %s ipboard password" % auth.user)
auth.ipboard_password = ''
auth.save()
def disable_discord(): def disable_discord():
@ -141,6 +125,19 @@ def disable_discord():
auth.save() auth.save()
def disable_market():
if settings.ENABLE_AUTH_MARKET:
logger.warn("ENABLE_AUTH_MARKET still True, after disabling users will still be able to activate Market accounts")
if settings.ENABLE_BLUE_DISCORD:
logger.warn("ENABLE_BLUE_MARKET still True, after disabling blues will still be able to activate Market accounts")
for auth in AuthServicesInfo.objects.all():
if auth.market_username:
logger.info("Clearing %s market username" % auth.user)
marketManager.disable_user(auth.market_username)
auth.market_username = ''
auth.save()
def deactivate_services(user): def deactivate_services(user):
change = False change = False
logger.debug("Deactivating services for user %s" % user) logger.debug("Deactivating services for user %s" % user)

2
services/views.py
View File

@ -714,7 +714,7 @@ def set_forum_password(request):
password=password) password=password)
if result != "": if result != "":
logger.info("Successfully set forum password for user %s" % request.user) logger.info("Successfully set forum password for user %s" % request.user)
messages.success('Set forum password.') messages.success(request, 'Set forum password.')
else: else:
logger.error("Failed to install custom forum password for user %s" % request.user) logger.error("Failed to install custom forum password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum account.') messages.error(request, 'An error occurred while processing your forum account.')