From f3405dcbc7822e17a867c0905ad0ae3c8644b1e5 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Sat, 14 Nov 2009 11:28:14 +0100 Subject: [PATCH] if linking accounts, don't update Murmur. see #56 --- pyweb/mumble/views.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py index 570714f..fa8ba24 100644 --- a/pyweb/mumble/views.py +++ b/pyweb/mumble/views.py @@ -103,12 +103,10 @@ def show( request, server ): regform = unregged_user_form( request.POST ); regform.server = srv; if regform.is_valid(): - # TODO: Check if LinkAcc is True, if yes: - # find MumbleUser with mumbleid=regform.mumbleid, - # if not exists create, save(). model = regform.save( commit=False ); - model.owner = request.user; - model.save(); + model.owner = request.user; + # If we're linking accounts, the change is local only. + model.save( dontConfigureMurmur=( "linkacc" in regform.data ) ); return HttpResponseRedirect( reverse( show, kwargs={ 'server': int(server), } ) ); else: displayTab = 1;