X-Git-Url: https://git.openstreetmap.org/osqa.git/blobdiff_plain/303b118d8ffc0ed2285166e362a91774f64ad807..ca804a9e3eebc769bfbe5bf1b7a4ace62cd4929b:/forum/views/users.py

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