Both auto-complete features, tag and questions were not filtering deleted objects.

[osqa.git] / forum / views / users.py

diff --git a/forum/views/users.py b/forum/views/users.py
index 6818974213892e49704d58e4ee536d971003e584..7202d39e7fbd2f2a5b1e8f758048972dd6572b72 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -15,7 +15,7 @@ from django.utils import simplejson
 from django.core.urlresolvers import reverse\r
 from forum.forms import *\r
 from forum.utils.html import sanitize_html\r
 from django.core.urlresolvers import reverse\r
 from forum.forms import *\r
 from forum.utils.html import sanitize_html\r

-from datetime import date\r
+from datetime import datetime, date\r

 import decorators\r
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction\r
 \r
 import decorators\r
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction\r
 \r


@@ -96,9 +96,9 @@ def edit_user(request, id):
             user.real_name = sanitize_html(form.cleaned_data['realname'])\r
             user.website = sanitize_html(form.cleaned_data['website'])\r
             user.location = sanitize_html(form.cleaned_data['city'])\r
             user.real_name = sanitize_html(form.cleaned_data['realname'])\r
             user.website = sanitize_html(form.cleaned_data['website'])\r
             user.location = sanitize_html(form.cleaned_data['city'])\r

-            user.date_of_birth = sanitize_html(form.cleaned_data['birthday'])\r
+            user.date_of_birth = form.cleaned_data['birthday']\r

             if user.date_of_birth == "None":\r
             if user.date_of_birth == "None":\r

-                user.date_of_birth = '1900-01-01'\r
+                user.date_of_birth = datetime(1900, 1, 1, 0, 0)\r

             user.about = sanitize_html(form.cleaned_data['about'])\r
 \r
             user.save()\r
             user.about = sanitize_html(form.cleaned_data['about'])\r
 \r
             user.save()\r


@@ -174,8 +174,8 @@ def user_view(template, tab_name, tab_description, page_title, private=False):
 \r
 @user_view('users/stats.html', 'stats', _('user profile'), _('user overview'))\r
 def user_stats(request, user):\r
 \r
 @user_view('users/stats.html', 'stats', _('user profile'), _('user overview'))\r
 def user_stats(request, user):\r

-    questions = Question.objects.filter(author=user, deleted=None).order_by('-added_at')\r
-    answers = Answer.objects.filter(author=user, deleted=None).order_by('-added_at')\r
+    questions = Question.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')\r
+    answers = Answer.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')\r

 \r
     up_votes = user.vote_up_count\r
     down_votes = user.vote_down_count\r
 \r
     up_votes = user.vote_up_count\r
     down_votes = user.vote_down_count\r


@@ -211,7 +211,7 @@ def user_recent(request, user):
 \r
 @user_view('users/votes.html', 'votes', _('user vote record'), _('votes'), True)\r
 def user_votes(request, user):\r
 \r
 @user_view('users/votes.html', 'votes', _('user vote record'), _('votes'), True)\r
 def user_votes(request, user):\r

-    votes = user.votes.filter(node__deleted=None, node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]\r
+    votes = user.votes.exclude(node__state_string__contains="(deleted").filter(node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]\r

 \r
     return {"view_user" : user, "votes" : votes}\r
 \r
 \r
     return {"view_user" : user, "votes" : votes}\r
 \r


@@ -227,11 +227,13 @@ def user_reputation(request, user):
             for i in range(len(values))\r
     ])\r
 \r
             for i in range(len(values))\r
     ])\r
 \r

-    return {"view_user": user, "reputation": reversed(rep), "graph_data": graph_data}\r
+    rep = user.reputes.filter(action__canceled=False).order_by('-date')[0:20]\r
+    \r
+    return {"view_user": user, "reputation": rep, "graph_data": graph_data}\r

 \r
 @user_view('users/questions.html', 'favorites', _('favorite questions'),  _('favorite questions'))\r
 def user_favorites(request, user):\r
 \r
 @user_view('users/questions.html', 'favorites', _('favorite questions'),  _('favorite questions'))\r
 def user_favorites(request, user):\r

-    favorites = FavoriteAction.objects.filter(user=user)\r
+    favorites = FavoriteAction.objects.filter(canceled=False, user=user)\r

 \r
     return {"favorites" : favorites, "view_user" : user}\r
 \r
 \r
     return {"favorites" : favorites, "view_user" : user}\r
 \r