From d82bcffab58b79b6cc56f72459d46c5de07ca530 Mon Sep 17 00:00:00 2001 From: c0de Date: Wed, 26 Sep 2018 20:59:55 -0500 Subject: [PATCH] test --- account/models.py | 9 +++++++++ gallery/utility.py | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/account/models.py b/account/models.py index c130ac6..c048c0c 100644 --- a/account/models.py +++ b/account/models.py @@ -27,6 +27,15 @@ class Account(models.Model): def __str__(self): return "<%s:%s>" % (self.id, self.user.username) + def get_meta(self): + meta = { + 'user': self.user.username, + 'first_login': self.first_login, + 'accepted_terms': self.accepted_terms + } + + return meta + def create_user(self, username, first_name, last_name, email, password): # Create a user usr_obj = User.objects.get_or_create(username=username, diff --git a/gallery/utility.py b/gallery/utility.py index caf583a..a5bd825 100644 --- a/gallery/utility.py +++ b/gallery/utility.py @@ -1,6 +1,7 @@ from django.http import HttpResponse from django.template import loader from django.contrib import auth +import logging # Usage: # template - relative path to the template you wish to render @@ -15,15 +16,18 @@ def _ResponseTemplate(template, request, message='', context=None): (context.get('message', False)): context['message'] += ' -- ' + str(message) else: + logging.warning('[_ResponseTemplate]: context was %s, not a dictionary like expected. Ignoring provided context' % type(context)) context = { 'message': str(message) } - + template = loader.get_template(str(template)) return HttpResponse(template.render(context, request)) # Logs out a user, sending them to the login screen with an optional message and context # Same arguments as _ResponseTemplate, except for the template def _ForceLogout(request, message='', context=None): + if request.user: + logging.debug('Logged out %s' % request.user) auth.logout(request) return _ResponseTemplate('account/login.html', request, message, context)