diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-18 16:13:51 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-18 16:13:51 -0400 |
| commit | 9921f8b795618bc017220c6ddd0a300b8e86a22a (patch) | |
| tree | c27c1c6956287d0b932a1cc0fdf0fc4e1b5c7cba | |
| parent | 966cb23c8bcba1b9b54c2380ae83d762a4d55590 (diff) | |
| download | askbot-9921f8b795618bc017220c6ddd0a300b8e86a22a.tar.gz askbot-9921f8b795618bc017220c6ddd0a300b8e86a22a.tar.bz2 askbot-9921f8b795618bc017220c6ddd0a300b8e86a22a.zip | |
fixed bug in the main page pagination
| -rw-r--r-- | askbot/search/state_manager.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/askbot/search/state_manager.py b/askbot/search/state_manager.py index efefbc40..5c4e0776 100644 --- a/askbot/search/state_manager.py +++ b/askbot/search/state_manager.py @@ -184,14 +184,25 @@ class SearchState(object): 'sort:' + self.sort ] - if self.query: - lst.append('query:' + urllib.quote(smart_str(self.query), safe=self.SAFE_CHARS)) + """ + ATTN: a copy from urls.py + r'(%s)?' % r'/scope:(?P<scope>\w+)' + + r'(%s)?' % r'/sort:(?P<sort>[\w\-]+)' + + r'(%s)?' % r'/tags:(?P<tags>[\w+.#,-]+)' + # Should match: const.TAG_CHARS + ','; TODO: Is `#` char decoded by the time URLs are processed ?? + r'(%s)?' % r'/author:(?P<author>\d+)' + + r'(%s)?' % r'/page:(?P<page>\d+)' + + r'(%s)?' % r'/query:(?P<query>.+)' + # INFO: query is last, b/c it can contain slash!!! + """ + + #order of items is important!!! if self.tags: lst.append('tags:' + urllib.quote(smart_str(const.TAG_SEP.join(self.tags)), safe=self.SAFE_CHARS)) if self.author: lst.append('author:' + str(self.author)) if self.page: lst.append('page:' + str(self.page)) + if self.query: + lst.append('query:' + urllib.quote(smart_str(self.query), safe=self.SAFE_CHARS)) return '/'.join(lst) + '/' def deepcopy(self): # TODO: test me |