diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-07 23:38:33 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-07 23:38:33 -0300 |
| commit | 48879e31ffa9906c47c940e9b345a714e0d4c4ec (patch) | |
| tree | e857efd53cb39b83dfc7366033fb11a24a834c2e | |
| parent | 15ed352261b6999c6039122d54f21cbe606ede85 (diff) | |
| download | askbot-48879e31ffa9906c47c940e9b345a714e0d4c4ec.tar.gz askbot-48879e31ffa9906c47c940e9b345a714e0d4c4ec.tar.bz2 askbot-48879e31ffa9906c47c940e9b345a714e0d4c4ec.zip | |
fixed a bug where an invalid query parameter triggers exception on the question page
| -rw-r--r-- | askbot/forms.py | 9 | ||||
| -rw-r--r-- | askbot/views/readers.py | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/askbot/forms.py b/askbot/forms.py index daa4bd25..276647f3 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -533,10 +533,6 @@ class ShowQuestionForm(forms.Form): page = forms.IntegerField(required=False) sort = forms.CharField(required=False) - def __init__(self, data, default_sort_method): - super(ShowQuestionForm, self).__init__(data) - self.default_sort_method = default_sort_method - def get_pruned_data(self): nones = ('answer', 'comment', 'page') for key in nones: @@ -566,10 +562,7 @@ class ShowQuestionForm(forms.Form): out_data['show_answer'] = in_data.get('answer', None) else: out_data['show_page'] = in_data.get('page', 1) - out_data['answer_sort_method'] = in_data.get( - 'sort', - self.default_sort_method - ) + out_data['answer_sort_method'] = in_data.get('sort', 'votes') out_data['show_comment'] = None out_data['show_answer'] = None self.cleaned_data = out_data diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 51a4da8e..ce92ded6 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -338,8 +338,7 @@ def question(request, id):#refactor - long subroutine. display question body, an #process url parameters #todo: fix inheritance of sort method from questions #before = datetime.datetime.now() - default_sort_method = request.session.get('questions_sort_method', 'votes') - form = ShowQuestionForm(request.GET, default_sort_method) + form = ShowQuestionForm(request.GET) form.full_clean()#always valid show_answer = form.cleaned_data['show_answer'] show_comment = form.cleaned_data['show_comment'] |