From acd28f3fe3ff6b9bf0b2e037b5d9d4915f3e2f13 Mon Sep 17 00:00:00 2001 From: Aamir Khan Date: Mon, 25 Jun 2012 23:53:50 -0400 Subject: generating UserProfile model and populating 'karma' in user_profile.html --- models.py | 2 +- templates/user_profile.html | 6 +++++- views/accounts.py | 23 ++++++++++++++++------- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/models.py b/models.py index 2594c64..95db0f1 100644 --- a/models.py +++ b/models.py @@ -16,4 +16,4 @@ class UserProfile(models.Model): # User Object user = models.OneToOneField(User) - karma = models.IntegerField() + karma = models.IntegerField(default=1) diff --git a/templates/user_profile.html b/templates/user_profile.html index 67ece00..fc2fdc4 100644 --- a/templates/user_profile.html +++ b/templates/user_profile.html @@ -24,7 +24,11 @@ {% trans 'Karma' %} - + {{ user_profile.karma }} + + + {% trans 'Date Joined' %} + {{ user.date_joined }} diff --git a/views/accounts.py b/views/accounts.py index cba7ce9..6b70df4 100644 --- a/views/accounts.py +++ b/views/accounts.py @@ -10,6 +10,7 @@ from django.contrib.auth.decorators import (login_required, permission_required, user_passes_test) from django.contrib.auth.forms import AuthenticationForm +from gsoc.models import UserProfile from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.http import HttpResponse, HttpResponseRedirect @@ -43,11 +44,19 @@ def user_login(request,template = 'login.html'): def user_profile(request, user_email = None): if not request.user.is_authenticated(): return redirect('user_login') - #try: - # the_user = User.objects.get(email=user_email) - #except MailmanApiError: - # return utils.render_api_error(request) - return render_to_response('user_profile.html', - # {'mm_user': the_user}, - context_instance=RequestContext(request)) + # try to render the user profile. + try: + user_profile = request.user.get_profile() + # @TODO: Include the error name e.g, ProfileDoesNotExist? + except: + user_profile = UserProfile.objects.create(user=request.user) + + print user_profile + + t = loader.get_template('user_profile.html') + c = RequestContext(request, { + 'user_profile' : user_profile, + }) + + return HttpResponse(t.render(c)) -- cgit