diff options
-rw-r--r-- | askbot/media/js/utils.js | 2 | ||||
-rw-r--r-- | askbot/urls.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/askbot/media/js/utils.js b/askbot/media/js/utils.js index f2cc0108..9d1e1c51 100644 --- a/askbot/media/js/utils.js +++ b/askbot/media/js/utils.js @@ -284,10 +284,10 @@ QSutils.patch_query_string = function (query_string, patch, remove) { /* The order of selectors should match the Django URL */ add_selector('scope'); add_selector('sort'); - add_selector('query'); add_selector('tags'); add_selector('author'); add_selector('page'); + add_selector('query'); return new_query_string; }; diff --git a/askbot/urls.py b/askbot/urls.py index a8eebf95..d3426980 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -62,10 +62,10 @@ urlpatterns = patterns('', (r'^%s' % _('questions') + r'(%s)?' % r'/scope:(?P<scope>\w+)' + r'(%s)?' % r'/sort:(?P<sort>[\w\-]+)' + - r'(%s)?' % r'/query:(?P<query>[^/]+)' + # INFO: question string cannot contain slash (/), which is a section terminator 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!!! r'/$'), views.readers.questions, name='questions' |