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

Get current model from db on service group update

Browse Source
This commit is contained in:
Adarnof 2016-03-23 17:10:37 +00:00
parent 44beee4d53
commit 8fb5058b2f
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
celerytask/signals.py
View File

@ -19,14 +19,14 @@ def m2m_changed_user_groups(sender, instance, action, *args, **kwargs):
logger.debug("Triggering service group update for %s" % instance) logger.debug("Triggering service group update for %s" % instance)
auth, c = AuthServicesInfo.objects.get_or_create(user=instance) auth, c = AuthServicesInfo.objects.get_or_create(user=instance)
if auth.jabber_username: if auth.jabber_username:
update_jabber_groups.delay(instance) update_jabber_groups.delay(instance.pk)
if auth.teamspeak3_uid: if auth.teamspeak3_uid:
update_teamspeak3_groups.delay(instance) update_teamspeak3_groups.delay(instance.pk)
if auth.forum_username: if auth.forum_username:
update_forum_groups.delay(instance) update_forum_groups.delay(instance.pk)
if auth.ipboard_username: if auth.ipboard_username:
update_ipboard_groups.delay(instance) update_ipboard_groups.delay(instance.pk)
if auth.discord_uid: if auth.discord_uid:
update_discord_groups.delay(instance) update_discord_groups.delay(instance.pk)
if auth.mumble_username: if auth.mumble_username:
update_mumble_groups.delay(instance) update_mumble_groups.delay(instance.pk)

18
celerytask/tasks.py
View File

@ -54,7 +54,8 @@ def is_teamspeak3_active():
return settings.ENABLE_AUTH_TEAMSPEAK3 or settings.ENABLE_BLUE_TEAMSPEAK3 return settings.ENABLE_AUTH_TEAMSPEAK3 or settings.ENABLE_BLUE_TEAMSPEAK3
@task @task
def update_jabber_groups(user): def update_jabber_groups(pk):
user = User.objects.get(pk=pk)
logger.debug("Updating jabber groups for user %s" % user) logger.debug("Updating jabber groups for user %s" % user)
authserviceinfo = AuthServicesInfo.objects.get(user=user) authserviceinfo = AuthServicesInfo.objects.get(user=user)
groups = [] groups = []
@ -71,7 +72,8 @@ def update_jabber_groups(user):
logger.debug("Updated user %s jabber groups." % user) logger.debug("Updated user %s jabber groups." % user)
@task @task
def update_mumble_groups(user): def update_mumble_groups(pk):
user = User.objects.get(pk=pk)
logger.debug("Updating mumble groups for user %s" % user) logger.debug("Updating mumble groups for user %s" % user)
authserviceinfo = AuthServicesInfo.objects.get(user=user) authserviceinfo = AuthServicesInfo.objects.get(user=user)
groups = [] groups = []
@ -88,7 +90,8 @@ def update_mumble_groups(user):
logger.debug("Updated user %s mumble groups." % user) logger.debug("Updated user %s mumble groups." % user)
@task @task
def update_forum_groups(user): def update_forum_groups(pk):
user = User.objects.get(pk=pk)
logger.debug("Updating forum groups for user %s" % user) logger.debug("Updating forum groups for user %s" % user)
authserviceinfo = AuthServicesInfo.objects.get(user=user) authserviceinfo = AuthServicesInfo.objects.get(user=user)
groups = [] groups = []
@ -105,7 +108,8 @@ def update_forum_groups(user):
logger.debug("Updated user %s forum groups." % user) logger.debug("Updated user %s forum groups." % user)
@task @task
def update_ipboard_groups(user): def update_ipboard_groups(pk):
user = User.objects.get(pk=pk)
logger.debug("Updating user %s ipboard groups." % user) logger.debug("Updating user %s ipboard groups." % user)
authserviceinfo = AuthServicesInfo.objects.get(user=user) authserviceinfo = AuthServicesInfo.objects.get(user=user)
groups = [] groups = []
@ -122,7 +126,8 @@ def update_ipboard_groups(user):
logger.debug("Updated user %s ipboard groups." % user) logger.debug("Updated user %s ipboard groups." % user)
@task @task
def update_teamspeak3_groups(user): def update_teamspeak3_groups(pk):
user = User.objects.get(pk=pk)
logger.debug("Updating user %s teamspeak3 groups" % user) logger.debug("Updating user %s teamspeak3 groups" % user)
usergroups = user.groups.all() usergroups = user.groups.all()
authserviceinfo = AuthServicesInfo.objects.get(user=user) authserviceinfo = AuthServicesInfo.objects.get(user=user)
@ -138,7 +143,8 @@ def update_teamspeak3_groups(user):
logger.debug("Updated user %s teamspeak3 groups." % user) logger.debug("Updated user %s teamspeak3 groups." % user)
@task @task
def update_discord_groups(user): def update_discord_groups(pk):
user = User.objects.get(pk=pk)
logger.debug("Updating discord groups for user %s" % user) logger.debug("Updating discord groups for user %s" % user)
authserviceinfo = AuthServicesInfo.objects.get(user=user) authserviceinfo = AuthServicesInfo.objects.get(user=user)
groups = [] groups = []

12
services/views.py
View File

@ -134,7 +134,7 @@ def activate_forum(request):
if result[0] != "": if result[0] != "":
AuthServicesInfoManager.update_user_forum_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_forum_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with forum credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with forum credentials. Updating groups." % request.user)
update_forum_groups.delay(request.user) update_forum_groups.delay(request.user.pk)
logger.info("Succesfully activated forum for user %s" % request.user) logger.info("Succesfully activated forum for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccesful attempt to activate forum for user %s" % request.user) logger.error("Unsuccesful attempt to activate forum for user %s" % request.user)
@ -183,7 +183,7 @@ def activate_ipboard_forum(request):
if result[0] != "": if result[0] != "":
AuthServicesInfoManager.update_user_ipboard_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_ipboard_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with ipboard credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with ipboard credentials. Updating groups." % request.user)
update_ipboard_groups.delay(request.user) update_ipboard_groups.delay(request.user.pk)
logger.info("Succesfully activated ipboard for user %s" % request.user) logger.info("Succesfully activated ipboard for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccesful attempt to activate ipboard for user %s" % request.user) logger.error("Unsuccesful attempt to activate ipboard for user %s" % request.user)
@ -231,7 +231,7 @@ def activate_jabber(request):
if info[0] is not "": if info[0] is not "":
AuthServicesInfoManager.update_user_jabber_info(info[0], info[1], request.user) AuthServicesInfoManager.update_user_jabber_info(info[0], info[1], request.user)
logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user)
update_jabber_groups.delay(request.user) update_jabber_groups.delay(request.user.pk)
logger.info("Succesfully activated jabber for user %s" % request.user) logger.info("Succesfully activated jabber for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccesful attempt to activate jabber for user %s" % request.user) logger.error("Unsuccesful attempt to activate jabber for user %s" % request.user)
@ -284,7 +284,7 @@ def activate_mumble(request):
if result[0] is not "": if result[0] is not "":
AuthServicesInfoManager.update_user_mumble_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_mumble_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with mumble credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with mumble credentials. Updating groups." % request.user)
update_mumble_groups.delay(request.user) update_mumble_groups.delay(request.user.pk)
logger.info("Succesfully activated mumble for user %s" % request.user) logger.info("Succesfully activated mumble for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccessful attempt to activate mumble for user %s" % request.user) logger.error("Unsuccessful attempt to activate mumble for user %s" % request.user)
@ -339,7 +339,7 @@ def activate_teamspeak3(request):
if result[0] is not "": if result[0] is not "":
AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user) AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user)
logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
update_teamspeak3_groups.delay(request.user) update_teamspeak3_groups.delay(request.user.pk)
logger.info("Succesfully activated TS3 for user %s" % request.user) logger.info("Succesfully activated TS3 for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user) logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user)
@ -443,7 +443,7 @@ def activate_discord(request):
if user_id != "": if user_id != "":
AuthServicesInfoManager.update_user_discord_info(user_id, request.user) AuthServicesInfoManager.update_user_discord_info(user_id, request.user)
logger.debug("Updated discord id %s for user %s" % (user_id, request.user)) logger.debug("Updated discord id %s for user %s" % (user_id, request.user))
update_discord_groups.delay(request.user) update_discord_groups.delay(request.user.pk)
logger.debug("Updated discord groups for user %s." % request.user) logger.debug("Updated discord groups for user %s." % request.user)
success = True success = True
logger.info("Succesfully activated discord for user %s" % request.user) logger.info("Succesfully activated discord for user %s" % request.user)