summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-04-26 18:12:55 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2011-04-26 18:12:55 -0400
commitc219bbfc3f9db68d6de90b036cfe25a5711dc120 (patch)
treeaccff374194c330295dabebf7ed06d83a83a29a5
parent15e9b1e454362214638d4333164deb82d9431df1 (diff)
downloadaskbot-c219bbfc3f9db68d6de90b036cfe25a5711dc120.tar.gz
askbot-c219bbfc3f9db68d6de90b036cfe25a5711dc120.tar.bz2
askbot-c219bbfc3f9db68d6de90b036cfe25a5711dc120.zip
made search state clear again, on second click over the questions tab
-rw-r--r--askbot/middleware/view_log.py9
-rw-r--r--askbot/search/state_manager.py1
-rw-r--r--askbot/tests/search_state_tests.py9
3 files changed, 14 insertions, 5 deletions
diff --git a/askbot/middleware/view_log.py b/askbot/middleware/view_log.py
index 8f036077..a1a32010 100644
--- a/askbot/middleware/view_log.py
+++ b/askbot/middleware/view_log.py
@@ -10,7 +10,7 @@ from django.views.static import serve
from django.views.i18n import javascript_catalog
from askbot.models import signals
from askbot.views.readers import questions as questions_view
-from askbot.views.commands import vote
+from askbot.views.commands import vote, get_tag_list
from askbot.views.writers import delete_comment, post_comments, retag_question
from askbot.views.readers import revisions
from askbot.views.meta import media
@@ -18,8 +18,11 @@ from askbot.search.state_manager import ViewLog
#todo: the list is getting bigger and bigger - maybe there is a better way to
#trigger reset of sarch state?
-IGNORED_VIEWS = (serve, vote, media, delete_comment, post_comments,
- retag_question, revisions, javascript_catalog)
+IGNORED_VIEWS = (
+ serve, vote, media, delete_comment, post_comments,
+ retag_question, revisions, javascript_catalog,
+ get_tag_list
+)
class ViewLogMiddleware(object):
diff --git a/askbot/search/state_manager.py b/askbot/search/state_manager.py
index f45f4bcc..9392190a 100644
--- a/askbot/search/state_manager.py
+++ b/askbot/search/state_manager.py
@@ -237,7 +237,6 @@ class ViewLog(object):
def should_reset_search_state(self):
"""return True if user stepped too far from the home page
and False otherwise"""
- return False
if self.get_previous(1) != 'questions':
if self.get_previous(2) != 'questions':
return True
diff --git a/askbot/tests/search_state_tests.py b/askbot/tests/search_state_tests.py
index bb1423ca..b4b66a65 100644
--- a/askbot/tests/search_state_tests.py
+++ b/askbot/tests/search_state_tests.py
@@ -49,10 +49,17 @@ class SearchStateTests(TestCase):
self.add_tag('tag1')
self.assertEquals(self.state.query, 'hahaha')
self.assert_tags_are('tag1')
- self.update({'reset_query':True})
+ self.update({'reset_query': True})
self.assertEquals(self.state.query, None)
self.assert_tags_are('tag1')
+ def test_start_over(self):
+ self.update({'query': 'hahaha'})
+ self.add_tag('tag1')
+ self.update({'start_over': True})
+ self.assertEquals(self.state.query, None)
+ self.assertEquals(self.state.tags, None)
+
def test_auto_reset_sort(self):
self.update({'sort': 'age-asc'})
self.assertEquals(self.state.sort, 'age-asc')