diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-08 20:36:47 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-03-08 20:36:47 -0300 |
| commit | 89644df19bb0050fe65dd0ae41c423ebc2697cea (patch) | |
| tree | 9a5da7d474879b77116913b733d44d685ed9dd7a /askbot/views | |
| parent | da2842d7703e6ef82dbcedaaa96de3e53a01695f (diff) | |
| download | askbot-89644df19bb0050fe65dd0ae41c423ebc2697cea.tar.gz askbot-89644df19bb0050fe65dd0ae41c423ebc2697cea.tar.bz2 askbot-89644df19bb0050fe65dd0ae41c423ebc2697cea.zip | |
minor edit option for question and answer to suppress email alerts
Diffstat (limited to 'askbot/views')
| -rw-r--r-- | askbot/views/writers.py | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/askbot/views/writers.py b/askbot/views/writers.py index b9e637ad..ee10c1ab 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: @@ -679,10 +683,20 @@ def edit_comment(request): if request.user.is_anonymous(): raise exceptions.PermissionDenied(_('Sorry, anonymous users cannot edit comments')) - comment_id = int(request.POST['comment_id']) + form = forms.EditCommentForm(request.POST) + if form.is_valid() == False: + return HttpResponseBadRequest() + + comment_id = form.cleaned_data['comment_id'] + suppress_email = form.cleaned_data['suppress_email'] + comment_post = models.Post.objects.get(post_type='comment', id=comment_id) - request.user.edit_comment(comment_post=comment_post, body_text = request.POST['comment']) + request.user.edit_comment( + comment_post=comment_post, + body_text = request.POST['comment'], + suppress_email=suppress_email + ) is_deletable = template_filters.can_delete_comment(comment_post.author, comment_post) is_editable = template_filters.can_edit_comment(comment_post.author, comment_post) |