djsundog
/
brutaldon
mirror of http://git.carcosa.net/jmcbray/brutaldon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hopefully fix issue with re-login with different method

This commit is contained in:
Jason McBrayer 2019-04-24 09:03:56 -04:00
parent 6ce142e11a
commit a427273f63
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
brutaldon/views.py
View File

@ -1,4 +1,5 @@
from django.http import HttpResponse, Http404, HttpResponseRedirect from django.http import HttpResponse, Http404, HttpResponseRedirect
from django.db import IntegrityError
from django.conf import settings as django_settings from django.conf import settings as django_settings
from django.shortcuts import render, redirect from django.shortcuts import render, redirect
from django.urls import reverse from django.urls import reverse
@ -412,16 +413,19 @@ def old_login(request):
request.session['active_username'] = user.username + '@' + request.session['active_instance_hostname'] request.session['active_username'] = user.username + '@' + request.session['active_instance_hostname']
account.username = request.session['active_username'] account.username = request.session['active_username']
request.session['timezone'] = account.preferences.timezone; request.session['timezone'] = account.preferences.timezone;
account.save()
accounts_dict = request.session.get('accounts_dict') accounts_dict = request.session.get('accounts_dict')
if not accounts_dict: if not accounts_dict:
accounts_dict = {} accounts_dict = {}
accounts_dict[account.username] = { 'account_id': account.id, 'user': user } accounts_dict[account.username] = { 'account_id': account.id, 'user': user }
request.session['accounts_dict'] = accounts_dict request.session['accounts_dict'] = accounts_dict
account.save()
return redirect(home) return redirect(home)
except IntegrityError:
account = Account.objects.get(username=account.username)
accounts_dict[account.username]['account_id'] = account.id
request.session['accounts_dict'] = accounts_dict
except Exception as ex: except Exception as ex:
form.add_error('', ex) form.add_error('', ex)
return render(request, 'setup/login.html', {'form': form}) return render(request, 'setup/login.html', {'form': form})