From 8053cafefdf7f9142fff50e071c4f95f976a07f1 Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Thu, 10 Jul 2014 17:58:23 +0530 Subject: [PATCH] Making the new user model work with id on username. --- coursereview/stats.py | 4 ++-- coursereview/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coursereview/stats.py b/coursereview/stats.py index cc21825..eca2f5c 100644 --- a/coursereview/stats.py +++ b/coursereview/stats.py @@ -36,8 +36,8 @@ def getTopReviewers(n): d[x.reviewer][1] += 1 else: d[x.reviewer] = [x.upvotes, 1] - votes = [[d[x][0], d[x][1], UserProfile.objects.get(user=x).name] for x in d.keys()] - revs = [[d[x][1], d[x][0], UserProfile.objects.get(user=x).name] for x in d.keys()] + votes = [[d[x][0], d[x][1], UserProfile.objects.get(username=x).name] for x in d.keys()] + revs = [[d[x][1], d[x][0], UserProfile.objects.get(username=x).name] for x in d.keys()] votes.sort() revs.sort() print votes, revs diff --git a/coursereview/views.py b/coursereview/views.py index e7d9caa..be92d69 100644 --- a/coursereview/views.py +++ b/coursereview/views.py @@ -323,7 +323,7 @@ def watch(request): courseID = GET[u'myCourse'] courseID = courseID.encode('ascii', 'ignore') text = GET[u'text'] - myUser = UserProfile.objects.get(email = GET[u'myUser']) + myUser = UserProfile.objects.get(username = GET[u'myUser']) myCourse = Course.objects.get(courseID = courseID) if text == u"Watch": myUser.watchList.add(myCourse) @@ -386,7 +386,7 @@ def report(request): GET = request.GET if GET.has_key(u'pk'): pk = int(GET[u'pk']) - myUser = UserProfile.objects.get(email = GET[u'myUser']) + myUser = UserProfile.objects.get(username = GET[u'myUser']) myReview = Review.objects.get(pk=pk) results['mess'] = "You have already reported this review." if myUser not in myReview.reporter.all():