Reverting the merges due to unsuccessfull conflict resolvement.

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

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 69edf3cfa9243df64602542f1ab8ec7af775ba33..9a6f66eaf2caaa78ec8439ea4e8715cad8948201 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -238,14 +238,16 @@ def tags(request):
     })
 
 def update_question_view_times(request, question):
-    last_seen_in_question = request.session.get('last_seen_in_question', {})
+    if not 'last_seen_in_question' in request.session:
+        request.session['last_seen_in_question'] = {}
 
-    last_seen = last_seen_in_question.get(question.id, None)
+    last_seen = request.session['last_seen_in_question'].get(question.id, None)
 
-    if (not last_seen) or (last_seen < question.last_activity_at):
+    if (not last_seen) or last_seen < question.last_activity_at:
         QuestionViewAction(question, request.user, ip=request.META['REMOTE_ADDR']).save()
-        last_seen_in_question[question.id] = datetime.datetime.now()
-        request.session['last_seen_in_question'] = last_seen_in_question
+        request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
+
+    request.session['last_seen_in_question'][question.id] = datetime.datetime.now()
 
 def match_question_slug(id, slug):
     slug_words = slug.split('-')