some cleanup on the listing of subscriptions and changing how we fetch the subscriptions

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

diff --git a/forum/views/users.py b/forum/views/users.py
index 7cb32249a907fda1cf5b0d3c368421cbae6d0d12..03745aeb35714aed60bd8b6b6cbfe6b4de721494 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -18,13 +18,13 @@ from forum.forms import *
 from forum.utils.html import sanitize_html\r
 from forum.modules import decorate\r
 from datetime import datetime, date\r
-import decorators\r
 from forum.actions import EditProfileAction, FavoriteAction, BonusRepAction, SuspendAction\r
 from forum.modules import ui\r
 from forum.utils import pagination\r
 from forum.views.readers import QuestionListPaginatorContext, AnswerPaginatorContext\r
 \r
 import time\r
+import datetime\r
 import decorators\r
 \r
 class UserReputationSort(pagination.SimpleSort):\r
@@ -40,6 +40,10 @@ class UserListPaginatorContext(pagination.PaginatorContext):
             (_('name'), pagination.SimpleSort(_('by username'), 'username', _("sorted by username"))),\r
         ), pagesizes=(20, 35, 60))\r
 \r
+class SubscriptionListPaginatorContext(pagination.PaginatorContext):\r
+    def __init__(self):\r
+        super (SubscriptionListPaginatorContext, self).__init__('SUBSCRIPTION_LIST', pagesizes=(5, 10, 20), default_pagesize=20)\r
+\r
 class UserAnswersPaginatorContext(pagination.PaginatorContext):\r
     def __init__(self):\r
         super (UserAnswersPaginatorContext, self).__init__('USER_ANSWER_LIST', sort_methods=(\r
@@ -64,6 +68,20 @@ def users(request):
     })\r
 \r
 \r
+#@decorators.render('users/online_users.html', 'online_users', _('Online Users'), weight=200)\r
+def online_users(request):\r
+    suser = request.REQUEST.get('q', "")\r
+\r
+    one_hour_ago = datetime.datetime.now() - datetime.timedelta(hours=1)\r
+    sql_datetime = datetime.datetime.strftime(one_hour_ago, '%Y-%m-%d %H:%M:%S')\r
+    users = User.objects.order_by('-last_seen')\r
+\r
+    return pagination.paginated(request, ('users', UserListPaginatorContext()), {\r
+        "users" : users,\r
+        "suser" : suser,\r
+    })\r
+\r
+\r
 @login_required\r
 def edit_user(request, id):\r
     user = get_object_or_404(User, id=id)\r
@@ -78,6 +96,12 @@ def edit_user(request, id):
                 user.email = new_email\r
                 user.email_isvalid = False\r
 \r
+                try:\r
+                    hash = ValidationHash.objects.get(user=request.user, type='email')\r
+                    hash.delete()\r
+                except:\r
+                    pass\r
+\r
             if settings.EDITABLE_SCREEN_NAME:\r
                 user.username = sanitize_html(form.cleaned_data['username'])\r
             user.real_name = sanitize_html(form.cleaned_data['realname'])\r
@@ -293,11 +317,27 @@ def user_favorites(request, user):
 \r
     return {"favorites" : favorites, "view_user" : user}\r
 \r
-@user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True, tabbed=False)\r
+@user_view('users/subscriptions.html', 'subscriptions', _('subscription'), _('subscriptions'), True, tabbed=False)\r
 def user_subscriptions(request, user):\r
     enabled = user.subscription_settings.enable_notifications\r
+    auto = request.GET.get('auto', 'True')\r
+    show_auto = True\r
+    manage_open = False\r
+    \r
+    if len(request.GET) > 0:\r
+        manage_open = True\r
+        \r
+    if auto == 'True':\r
+        show_auto = True\r
+        subscriptions = QuestionSubscription.objects.filter(user=user).order_by('-last_view')        \r
+        #subscriptions = user.subscriptions.all().order_by('-questionsubscription__last_view')\r
+    else:\r
+        show_auto = False\r
+        subscriptions = QuestionSubscription.objects.filter(user=user, auto_subscription=False).order_by('-last_view')\r
+        #subscriptions = user.subscriptions.filter(questionsubscription__auto_subscription=False).order_by('-questionsubscription__last_view')\r
 \r
-    if request.method == 'POST':        \r
+    if request.method == 'POST':\r
+        manage_open = False\r
         form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings)\r
 \r
         if form.is_valid():\r
@@ -319,7 +359,14 @@ def user_subscriptions(request, user):
     else:\r
         form = SubscriptionSettingsForm(instance=user.subscription_settings)\r
 \r
-    return {'view_user':user, 'notificatons_on': enabled, 'form':form}\r
+    return pagination.paginated(request, ('subscriptions', SubscriptionListPaginatorContext()), {\r
+        'subscriptions':subscriptions,\r
+        'view_user':user,\r
+        'notificatons_on': enabled,\r
+        'form':form,\r
+        "auto":show_auto,\r
+        "manage_open":manage_open\r
+    })\r
 \r
 @user_view('users/preferences.html', 'preferences', _('preferences'), _('preferences'), True, tabbed=False)\r
 def user_preferences(request, user):\r
@@ -350,4 +397,3 @@ def account_settings(request):
     'msg': msg,\r
     'is_openid': is_openid\r
     }, context_instance=RequestContext(request))\r
-\r