X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/e6d9fbafa13f1acaabaef37cacef4091a287dd3c..febc8df810701062ed45c129c0e30c504db28849:/forum/views/users.py?ds=sidebyside

diff --git a/forum/views/users.py b/forum/views/users.py
index 55a1609..da556be 100644
--- 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
 from forum.forms import *
 from forum.utils.html import sanitize_html
-from datetime import date
+from datetime import datetime, date
 import decorators
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction
 
@@ -96,9 +96,9 @@ def edit_user(request, id):
             user.real_name = sanitize_html(form.cleaned_data['realname'])
             user.website = sanitize_html(form.cleaned_data['website'])
             user.location = sanitize_html(form.cleaned_data['city'])
-            user.date_of_birth = sanitize_html(form.cleaned_data['birthday'])
+            user.date_of_birth = form.cleaned_data['birthday']
             if user.date_of_birth == "None":
-                user.date_of_birth = '1900-01-01'
+                user.date_of_birth = datetime(1900, 1, 1, 0, 0)
             user.about = sanitize_html(form.cleaned_data['about'])
 
             user.save()
@@ -174,8 +174,8 @@ def user_view(template, tab_name, tab_description, page_title, private=False):
 
 @user_view('users/stats.html', 'stats', _('user profile'), _('user overview'))
 def user_stats(request, user):
-    questions = Question.objects.filter(author=user, deleted=None).order_by('-added_at')
-    answers = Answer.objects.filter(author=user, deleted=None).order_by('-added_at')
+    questions = Question.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')
+    answers = Answer.objects.filter_state(deleted=False).filter(author=user).order_by('-added_at')
 
     up_votes = user.vote_up_count
     down_votes = user.vote_down_count
@@ -204,14 +204,14 @@ def user_stats(request, user):
 
 @user_view('users/recent.html', 'recent', _('recent user activity'), _('recent activity'))
 def user_recent(request, user):
-    activities = user.actions.exclude(action_type__in=("voteup", "votedown", "voteupcomment", "flag")).order_by('-action_date')[:USERS_PAGE_SIZE]
+    activities = user.actions.exclude(action_type__in=("voteup", "votedown", "voteupcomment", "flag", "newpage", "editpage")).order_by('-action_date')[:USERS_PAGE_SIZE]
 
     return {"view_user" : user, "activities" : activities}
 
 
 @user_view('users/votes.html', 'votes', _('user vote record'), _('votes'), True)
 def user_votes(request, user):
-    votes = user.votes.filter(node__deleted=None, node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]
+    votes = user.votes.exclude(node__state_string__contains="(deleted").filter(node__node_type__in=("question", "answer")).order_by('-voted_at')[:USERS_PAGE_SIZE]
 
     return {"view_user" : user, "votes" : votes}
 
@@ -233,7 +233,7 @@ def user_reputation(request, user):
 
 @user_view('users/questions.html', 'favorites', _('favorite questions'),  _('favorite questions'))
 def user_favorites(request, user):
-    favorites = FavoriteAction.objects.filter(user=user)
+    favorites = FavoriteAction.objects.filter(canceled=False, user=user)
 
     return {"favorites" : favorites, "view_user" : user}
 
@@ -250,13 +250,13 @@ def user_subscriptions(request, user):
                 request.user.message_set.create(message=_('Notifications are now enabled'))
             else:
                 request.user.message_set.create(message=_('Notifications are now disabled'))
-        else:
-            form.is_valid()
-            for k,v in form.cleaned_data.items():
-                setattr(user.subscription_settings, k, v)
 
-            user.subscription_settings.save()
-            request.user.message_set.create(message=_('New subscription settings are now saved'))
+        form.is_valid()
+        for k,v in form.cleaned_data.items():
+            setattr(user.subscription_settings, k, v)
+
+        user.subscription_settings.save()
+        request.user.message_set.create(message=_('New subscription settings are now saved'))
     else:
         form = SubscriptionSettingsForm(user.subscription_settings.__dict__)