1538

pending completion

Build # 1538

Build Type

Pull #737

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/pythonindia/junction/commit/<a class=hub.com/pythonindia/junction/commit/<a class="double-link" href="https://git"><a class=hub.com/pythonindia/junction/commit/<a class="double-link" href="https://git"><a class=hub.com/pythonindia/junction/commit/<a class="double-link" href="https://git"><a class=hub.com/pythonindia/junction/commit/5a750a494979642e49dc8d1c6110dadaa0953f1d">5a750a494">&lt;a href=&quot;https://github.com/pythonindia/junction/commit/</a><a class="double-link" href="https://github.com/pythonindia/junction/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/pythonindia/junction/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/pythonindia/junction/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/pythonindia/junction/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/pythonindia/junction/commit/5a750a494979642e49dc8d1c6110dadaa0953f1d">5a750a494</a><a href="https://github.com/pythonindia/junction/commit/5a750a494979642e49dc8d1c6110dadaa0953f1d">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/pythonindia/junction/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/pythonindia/junction/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/pythonindia/junction/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/pythonindia/junction/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/pythonindia/junction/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/pythonindia/junction/commit/5a750a494979642e49dc8d1c6110dadaa0953f1d&quot;&gt;5a750a494&lt;/a&gt;&lt;a href=&quot;https://github.com/pythonindia/junction/commit/5a750a494979642e49dc8d1c6110dadaa0953f1d&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/pythonindia/junction/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://gi... (continued)

Pull Request Pull Request #737: [Enhancement] Delete self comment. Solves issue #736

Run Details

12 of 12 new or added lines in 2 files covered. (100.0%)

1375 of 2046 relevant lines covered (67.2%)

1.34 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

56.96

/junction/proposals/comments_views.py

# -*- coding: utf-8 -*-

from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.http.response import (
    HttpResponse,
    HttpResponseForbidden,
    HttpResponseRedirect,
)
from django.shortcuts import Http404, get_object_or_404
from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_http_methods

from junction.conferences.models import Conference

from . import permissions
from .forms import ProposalCommentForm
from .models import Proposal, ProposalComment
from .services import send_mail_for_new_comment, user_action_for_spam


@login_required
@require_http_methods(["POST"])
def create_proposal_comment(request, conference_slug, proposal_slug):
    conference = get_object_or_404(Conference, slug=conference_slug)
    proposal = get_object_or_404(Proposal, slug=proposal_slug, conference=conference)
    form = ProposalCommentForm(request.POST)

    if request.user.is_active is False:
        raise PermissionDenied()

    if form.is_valid():
        comment = form.cleaned_data["comment"]
        private = form.cleaned_data["private"]
        reviewer = form.cleaned_data["reviewer"]

        has_perm = permissions.is_proposal_author_or_proposal_section_reviewer(
            user=request.user, conference=conference, proposal=proposal
        )

        if private and not has_perm:
            raise Http404()

        proposal_comment = ProposalComment.objects.create(
            proposal=proposal,
            comment=comment,
            private=private,
            reviewer=reviewer,
            commenter=request.user,
        )
        host = "{}://{}".format(settings.SITE_PROTOCOL, request.META.get("HTTP_HOST"))

        if settings.USE_ASYNC_FOR_EMAIL:
            send_mail_for_new_comment.delay(proposal_comment.id, host)
        else:
            send_mail_for_new_comment(proposal_comment.id, host)

    redirect_url = reverse("proposal-detail", args=[conference.slug, proposal.slug])

    if private:
        redirect_url += "#js-reviewers"
    elif reviewer:
        redirect_url += "#js-only-reviewers"
    else:
        redirect_url += "#js-comments"

    return HttpResponseRedirect(redirect_url)


@login_required
@csrf_exempt
@require_http_methods(["POST"])
def mark_comment_as_spam(request, conference_slug, proposal_slug, proposal_comment_id):
    if not request.is_ajax() or request.user.is_active is False:
        return HttpResponseForbidden()

    conference = get_object_or_404(Conference, slug=conference_slug)
    proposal = get_object_or_404(Proposal, slug=proposal_slug, conference=conference)
    proposal_comment = get_object_or_404(
        ProposalComment, proposal=proposal, id=proposal_comment_id
    )

    if proposal_comment.is_spam:
        return HttpResponse("Already marked as spam")

    proposal_comment.is_spam = True
    proposal_comment.marked_as_spam_by = request.user
    proposal_comment.save()

    user_action_for_spam(
        proposal_comment.commenter, getattr(settings, "USER_SPAM_THRESHOLD", 2)
    )

    return HttpResponse("Marked as spam")


@login_required
@csrf_exempt
@require_http_methods(["POST"])
def unmark_comment_as_spam(
    request, conference_slug, proposal_slug, proposal_comment_id
):
    if not request.is_ajax() or request.user.is_active is False:
        return HttpResponseForbidden()

    conference = get_object_or_404(Conference, slug=conference_slug)
    proposal = get_object_or_404(Proposal, slug=proposal_slug, conference=conference)
    proposal_comment = get_object_or_404(
        ProposalComment, proposal=proposal, id=proposal_comment_id
    )

    if proposal_comment.is_spam and proposal_comment.marked_as_spam_by == request.user:
        proposal_comment.is_spam = False
        proposal_comment.marked_as_spam_by = None
        proposal_comment.save()

        user_action_for_spam(
            proposal_comment.commenter, getattr(settings, "USER_SPAM_THRESHOLD", 2)
        )

        return HttpResponse("Unmarked as spam")

    return HttpResponseForbidden()

@login_required
@csrf_exempt
@require_http_methods(["POST"])
def delete_self_comment(request, conference_slug, proposal_slug, proposal_comment_id):
    if not request.is_ajax() or request.user.is_active is False:
        return HttpResponseForbidden()

    conference = get_object_or_404(Conference, slug=conference_slug)
    proposal = get_object_or_404(Proposal, slug=proposal_slug, conference=conference)
    proposal_comment = get_object_or_404(
        ProposalComment, proposal=proposal, id=proposal_comment_id
    )

    proposal_comment.delete()
    return HttpResponse("Comment Deleted")
    

1	# -- coding: utf-8 --
2
3	from django.conf import settings	2✔
4	from django.contrib.auth.decorators import login_required	2✔
5	from django.core.exceptions import PermissionDenied	2✔
6	from django.core.urlresolvers import reverse	2✔
7	from django.http.response import (	2✔
8	HttpResponse,
9	HttpResponseForbidden,
10	HttpResponseRedirect,
11	)
12	from django.shortcuts import Http404, get_object_or_404	2✔
13	from django.views.decorators.csrf import csrf_exempt	2✔
14	from django.views.decorators.http import require_http_methods	2✔
15
16	from junction.conferences.models import Conference	2✔
17
18	from . import permissions	2✔
19	from .forms import ProposalCommentForm	2✔
20	from .models import Proposal, ProposalComment	2✔
21	from .services import send_mail_for_new_comment, user_action_for_spam	2✔
22
23
24	@login_required	2✔
25	@require_http_methods(["POST"])	2✔
26	def create_proposal_comment(request, conference_slug, proposal_slug):
27	conference = get_object_or_404(Conference, slug=conference_slug)	2✔
28	proposal = get_object_or_404(Proposal, slug=proposal_slug, conference=conference)	2✔
29	form = ProposalCommentForm(request.POST)	2✔
30
31	if request.user.is_active is False:	2✔
32	raise PermissionDenied()	×
33
34	if form.is_valid():	2✔
35	comment = form.cleaned_data["comment"]	2✔
36	private = form.cleaned_data["private"]	2✔
37	reviewer = form.cleaned_data["reviewer"]	2✔
38
39	has_perm = permissions.is_proposal_author_or_proposal_section_reviewer(	2✔
40	user=request.user, conference=conference, proposal=proposal
41	)
42
43	if private and not has_perm:	2✔
44	raise Http404()	×
45
46	proposal_comment = ProposalComment.objects.create(	2✔
47	proposal=proposal,
48	comment=comment,
49	private=private,
50	reviewer=reviewer,
51	commenter=request.user,
52	)
53	host = "{}://{}".format(settings.SITE_PROTOCOL, request.META.get("HTTP_HOST"))	2✔
54
55	if settings.USE_ASYNC_FOR_EMAIL:	2✔
56	send_mail_for_new_comment.delay(proposal_comment.id, host)	×
57	else:
58	send_mail_for_new_comment(proposal_comment.id, host)	2✔
59
60	redirect_url = reverse("proposal-detail", args=[conference.slug, proposal.slug])	2✔
61
62	if private:	2✔
63	redirect_url += "#js-reviewers"	2✔
64	elif reviewer:	2✔
65	redirect_url += "#js-only-reviewers"	2✔
66	else:
67	redirect_url += "#js-comments"	2✔
68
69	return HttpResponseRedirect(redirect_url)	2✔
70
71
72	@login_required	2✔
73	@csrf_exempt	2✔
74	@require_http_methods(["POST"])	2✔
75	def mark_comment_as_spam(request, conference_slug, proposal_slug, proposal_comment_id):
76	if not request.is_ajax() or request.user.is_active is False:	×
77	return HttpResponseForbidden()	×
78
79	conference = get_object_or_404(Conference, slug=conference_slug)	×
80	proposal = get_object_or_404(Proposal, slug=proposal_slug, conference=conference)	×
81	proposal_comment = get_object_or_404(	×
82	ProposalComment, proposal=proposal, id=proposal_comment_id
83	)
84
85	if proposal_comment.is_spam:	×
86	return HttpResponse("Already marked as spam")	×
87
88	proposal_comment.is_spam = True	×
89	proposal_comment.marked_as_spam_by = request.user	×
90	proposal_comment.save()	×
91
92	user_action_for_spam(	×
93	proposal_comment.commenter, getattr(settings, "USER_SPAM_THRESHOLD", 2)
94	)
95
96	return HttpResponse("Marked as spam")	×
97
98
99	@login_required	2✔
100	@csrf_exempt	2✔
101	@require_http_methods(["POST"])	2✔
102	def unmark_comment_as_spam(
103	request, conference_slug, proposal_slug, proposal_comment_id
104	):
105	if not request.is_ajax() or request.user.is_active is False:	×
106	return HttpResponseForbidden()	×
107
108	conference = get_object_or_404(Conference, slug=conference_slug)	×
109	proposal = get_object_or_404(Proposal, slug=proposal_slug, conference=conference)	×
110	proposal_comment = get_object_or_404(	×
111	ProposalComment, proposal=proposal, id=proposal_comment_id
112	)
113
114	if proposal_comment.is_spam and proposal_comment.marked_as_spam_by == request.user:	×
115	proposal_comment.is_spam = False	×
116	proposal_comment.marked_as_spam_by = None	×
117	proposal_comment.save()	×
118
119	user_action_for_spam(	×
120	proposal_comment.commenter, getattr(settings, "USER_SPAM_THRESHOLD", 2)
121	)
122
123	return HttpResponse("Unmarked as spam")	×
124
125	return HttpResponseForbidden()	×
126
127	@login_required	2✔
128	@csrf_exempt	2✔
129	@require_http_methods(["POST"])	2✔
130	def delete_self_comment(request, conference_slug, proposal_slug, proposal_comment_id):
131	if not request.is_ajax() or request.user.is_active is False:	×
132	return HttpResponseForbidden()	×
133
134	conference = get_object_or_404(Conference, slug=conference_slug)	×
135	proposal = get_object_or_404(Proposal, slug=proposal_slug, conference=conference)	×
136	proposal_comment = get_object_or_404(	×
137	ProposalComment, proposal=proposal, id=proposal_comment_id
138	)
139
140	proposal_comment.delete()	×
141	return HttpResponse("Comment Deleted")	×
142

pythonindia / junction / 1538

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous