diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-08 21:29:39 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-08 21:29:39 -0300 |
| commit | 1fbac3a3a3352526e86f19767d67e7c614c67a3b (patch) | |
| tree | 1c2d3fe0217c28861cdcda285d2d41f2a11a643a /askbot/views | |
| parent | 75681f982cafe1edd3f87b5114da6b2d684bccf1 (diff) | |
| parent | 89644df19bb0050fe65dd0ae41c423ebc2697cea (diff) | |
| download | askbot-1fbac3a3a3352526e86f19767d67e7c614c67a3b.tar.gz askbot-1fbac3a3a3352526e86f19767d67e7c614c67a3b.tar.bz2 askbot-1fbac3a3a3352526e86f19767d67e7c614c67a3b.zip | |
merged with the master branch
Diffstat (limited to 'askbot/views')
| -rw-r--r-- | askbot/views/readers.py | 3 | ||||
| -rw-r--r-- | askbot/views/writers.py | 23 |
2 files changed, 17 insertions, 9 deletions
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'] diff --git a/askbot/views/writers.py b/askbot/views/writers.py index d767fe77..328ba501 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -424,6 +424,7 @@ def edit_question(request, id): is_anon_edit = form.cleaned_data['stay_anonymous'] is_wiki = form.cleaned_data.get('wiki', question.wiki) post_privately = form.cleaned_data['post_privately'] + suppress_email = form.cleaned_data['suppress_email'] user = form.get_post_user(request.user) @@ -435,7 +436,8 @@ def edit_question(request, id): tags = form.cleaned_data['tags'], wiki = is_wiki, edit_anonymously = is_anon_edit, - is_private = post_privately + is_private = post_privately, + suppress_email=suppress_email ) return HttpResponseRedirect(question.get_absolute_url()) else: @@ -510,13 +512,15 @@ def edit_answer(request, id): if form.is_valid(): if form.has_changed(): user = form.get_post_user(request.user) + suppress_email = form.cleaned_data['suppress_email'] + is_private = form.cleaned_data.get('post_privately', False) user.edit_answer( answer=answer, body_text=form.cleaned_data['text'], revision_comment=form.cleaned_data['summary'], wiki=form.cleaned_data.get('wiki', answer.wiki), - is_private=form.cleaned_data.get('post_privately', False) - #todo: add wiki field to form + is_private=is_private, + suppress_email=suppress_email ) return HttpResponseRedirect(answer.get_absolute_url()) else: @@ -705,15 +709,15 @@ def edit_comment(request): if form.is_valid() == False: raise exceptions.PermissionDenied('This content is forbidden') - comment_id = form.cleaned_data['comment_id'] comment_post = models.Post.objects.get( post_type='comment', - id=comment_id + id=form.cleaned_data['comment_id'] ) request.user.edit_comment( comment_post=comment_post, - body_text=form.cleaned_data['comment'] + body_text=form.cleaned_data['comment'], + suppress_email=form.cleaned_data['suppress_email'] ) is_deletable = template_filters.can_delete_comment( @@ -755,7 +759,12 @@ def delete_comment(request): raise exceptions.PermissionDenied(msg) if request.is_ajax(): - comment_id = request.POST['comment_id'] + form = forms.DeleteCommentForm(request.POST) + + if form.is_valid() == False: + return HttpResponseBadRequest() + + comment_id = form.cleaned_data['comment_id'] comment = get_object_or_404(models.Post, post_type='comment', id=comment_id) request.user.assert_can_delete_comment(comment) |