1962373523

Build # 1962373523

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/HewlettPackard/squest/commit/<a class=hub.com/HewlettPackard/squest/commit/e3226dbf5a83ed7bf148d9d54c18b1f00c6c2b1f">e3226dbf5<a href="https://github.com/HewlettPackard/squest/commit/e3226dbf5a83ed7bf148d9d54c18b1f00c6c2b1f">">Merge </a><a class="double-link" href="https://github.com/HewlettPackard/squest/commit/<a class="double-link" href="https://github.com/HewlettPackard/squest/commit/456596b0f79780db5a40a0cd1f5053bf3c380d76">456596b0f</a>">456596b0f</a><a href="https://github.com/HewlettPackard/squest/commit/e3226dbf5a83ed7bf148d9d54c18b1f00c6c2b1f"> into 4efb27897">4efb27897</a>

Pull Request Pull Request #415: [Feature] Message can be edited

Run Details

41 of 41 new or added lines in 4 files covered. (100.0%)

6401 of 6837 relevant lines covered (93.62%)

0.94 hits per line

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

91.8

/service_catalog/views/request.py

from django.contrib.auth.decorators import login_required, user_passes_test
from django.core.exceptions import PermissionDenied
from django.shortcuts import get_object_or_404
from django.shortcuts import render, redirect
from django.urls import reverse
from django.utils.safestring import mark_safe
from django_fsm import can_proceed

from guardian.decorators import permission_required_or_403
from guardian.shortcuts import get_objects_for_user

from service_catalog.forms import RequestMessageForm
from service_catalog.models import Request, RequestMessage
from service_catalog.models.instance import InstanceState
from service_catalog.mail_utils import send_email_request_canceled


@login_required
@permission_required_or_403('service_catalog.cancel_request', (Request, 'id', 'request_id'))
def request_cancel(request, request_id):
    target_request = get_object_or_404(Request, id=request_id)
    if request.method == "POST":
        # check that we can cancel the request
        if not can_proceed(target_request.cancel):
            raise PermissionDenied
        send_email_request_canceled(target_request,
                                    user_applied_state=request.user,
                                    request_owner_user=target_request.user)

        if target_request.cancel():
            target_request.save()
        return redirect('service_catalog:request_list')
    breadcrumbs = [
        {'text': 'Requests', 'url': reverse('service_catalog:request_list')},
        {'text': request_id, 'url': ""},
    ]
    context = {
        'breadcrumbs': breadcrumbs,
        'confirm_text': mark_safe(f"Do you want to cancel the request <strong>{target_request.id}</strong>?"),
        'action_url': reverse('service_catalog:request_cancel', kwargs={'request_id': request_id}),
        'button_text': 'Confirm cancel request',
        'details': {
            'warning_sentence': f"Canceling this request will delete the instance {target_request.instance.name}."
        } if target_request.instance.state == InstanceState.PENDING else None
    }
    return render(request, "generics/confirm-delete-template.html", context)


@login_required
@permission_required_or_403('service_catalog.comment_request', (Request, 'id', 'request_id'))
def request_comment(request, request_id):
    breadcrumbs = [
        {'text': 'Requests', 'url': reverse('service_catalog:request_list')},
        {'text': request_id, 'url': ""},
    ]
    target_request = get_object_or_404(Request, id=request_id)
    messages = RequestMessage.objects.filter(request=target_request)
    if request.method == "POST":
        form = RequestMessageForm(request.POST or None, request.FILES or None, sender=request.user,
                                  target_request=target_request)
        if form.is_valid():
            form.save()
            return redirect('service_catalog:request_comment', target_request.id)
    else:
        form = RequestMessageForm(sender=request.user, target_request=target_request)
    context = {
        'form': form,
        'target_request': target_request,
        'messages': messages,
        'breadcrumbs': breadcrumbs
    }
    return render(request, "service_catalog/common/request-comment.html", context)


@login_required
@permission_required_or_403('service_catalog.comment_request', (Request, 'id', 'request_id'))
def request_comment_edit(request, request_id, comment_id):
    if request.user.is_superuser:
        request_comment = get_object_or_404(RequestMessage, id=comment_id)
    else:
        request_comment = get_object_or_404(RequestMessage, id=comment_id, sender=request.user)
    if request.method == "POST":
        form = RequestMessageForm(request.POST or None, request.FILES or None, sender=request_comment.sender,
                                  target_request=request_comment.request, instance=request_comment)
        if form.is_valid():
            form.save()
            return redirect('service_catalog:request_comment', request_id)
    else:
        form = RequestMessageForm(sender=request_comment.sender, target_request=request_comment.request, instance=request_comment)
    context = {
        'form': form,
        'breadcrumbs': [
            {'text': 'Requests', 'url': reverse('service_catalog:request_list')},
            {'text': request_id, 'url': reverse('service_catalog:request_details',
                                                kwargs={'request_id': request_id})},
        ],
        'action': 'edit'
    }
    return render(request, "generics/generic_form.html", context)


@login_required
def request_details(request, request_id):
    request_list = get_objects_for_user(request.user, 'service_catalog.view_request')
    target_request = get_object_or_404(request_list, id=request_id)
    context = {'target_request': target_request,
               'breadcrumbs': [
                   {'text': 'Requests', 'url': reverse('service_catalog:request_list')},
                   {'text': request_id, 'url': ""},
               ],
               }
    return render(request, 'service_catalog/common/request-details.html', context=context)

1	from django.contrib.auth.decorators import login_required, user_passes_test	1✔
2	from django.core.exceptions import PermissionDenied	1✔
3	from django.shortcuts import get_object_or_404	1✔
4	from django.shortcuts import render, redirect	1✔
5	from django.urls import reverse	1✔
6	from django.utils.safestring import mark_safe	1✔
7	from django_fsm import can_proceed	1✔
8
9	from guardian.decorators import permission_required_or_403	1✔
10	from guardian.shortcuts import get_objects_for_user	1✔
11
12	from service_catalog.forms import RequestMessageForm	1✔
13	from service_catalog.models import Request, RequestMessage	1✔
14	from service_catalog.models.instance import InstanceState	1✔
15	from service_catalog.mail_utils import send_email_request_canceled	1✔
16
17
18	@login_required	1✔
19	@permission_required_or_403('service_catalog.cancel_request', (Request, 'id', 'request_id'))	1✔
20	def request_cancel(request, request_id):	1✔
21	target_request = get_object_or_404(Request, id=request_id)	1✔
22	if request.method == "POST":	1✔
23	# check that we can cancel the request
24	if not can_proceed(target_request.cancel):	1✔
25	raise PermissionDenied	1✔
26	send_email_request_canceled(target_request,	1✔
27	user_applied_state=request.user,
28	request_owner_user=target_request.user)
29
30	if target_request.cancel():	1✔
31	target_request.save()	×
32	return redirect('service_catalog:request_list')	1✔
33	breadcrumbs = [	1✔
34	{'text': 'Requests', 'url': reverse('service_catalog:request_list')},
35	{'text': request_id, 'url': ""},
36	]
37	context = {	1✔
38	'breadcrumbs': breadcrumbs,
39	'confirm_text': mark_safe(f"Do you want to cancel the request <strong>{target_request.id}</strong>?"),
40	'action_url': reverse('service_catalog:request_cancel', kwargs={'request_id': request_id}),
41	'button_text': 'Confirm cancel request',
42	'details': {
43	'warning_sentence': f"Canceling this request will delete the instance {target_request.instance.name}."
44	} if target_request.instance.state == InstanceState.PENDING else None
45	}
46	return render(request, "generics/confirm-delete-template.html", context)	1✔
47
48
49	@login_required	1✔
50	@permission_required_or_403('service_catalog.comment_request', (Request, 'id', 'request_id'))	1✔
51	def request_comment(request, request_id):	1✔
52	breadcrumbs = [	1✔
53	{'text': 'Requests', 'url': reverse('service_catalog:request_list')},
54	{'text': request_id, 'url': ""},
55	]
56	target_request = get_object_or_404(Request, id=request_id)	1✔
57	messages = RequestMessage.objects.filter(request=target_request)	1✔
58	if request.method == "POST":	1✔
59	form = RequestMessageForm(request.POST or None, request.FILES or None, sender=request.user,	1✔
60	target_request=target_request)
61	if form.is_valid():	1✔
62	form.save()	1✔
63	return redirect('service_catalog:request_comment', target_request.id)	1✔
64	else:
65	form = RequestMessageForm(sender=request.user, target_request=target_request)	1✔
66	context = {	1✔
67	'form': form,
68	'target_request': target_request,
69	'messages': messages,
70	'breadcrumbs': breadcrumbs
71	}
72	return render(request, "service_catalog/common/request-comment.html", context)	1✔
73
74
75	@login_required	1✔
76	@permission_required_or_403('service_catalog.comment_request', (Request, 'id', 'request_id'))	1✔
77	def request_comment_edit(request, request_id, comment_id):	1✔
78	if request.user.is_superuser:	1✔
79	request_comment = get_object_or_404(RequestMessage, id=comment_id)	1✔
80	else:
81	request_comment = get_object_or_404(RequestMessage, id=comment_id, sender=request.user)	×
82	if request.method == "POST":	1✔
83	form = RequestMessageForm(request.POST or None, request.FILES or None, sender=request_comment.sender,	1✔
84	target_request=request_comment.request, instance=request_comment)
85	if form.is_valid():	1✔
86	form.save()	1✔
87	return redirect('service_catalog:request_comment', request_id)	1✔
88	else:
89	form = RequestMessageForm(sender=request_comment.sender, target_request=request_comment.request, instance=request_comment)	×
90	context = {	×
91	'form': form,
92	'breadcrumbs': [
93	{'text': 'Requests', 'url': reverse('service_catalog:request_list')},
94	{'text': request_id, 'url': reverse('service_catalog:request_details',
95	kwargs={'request_id': request_id})},
96	],
97	'action': 'edit'
98	}
99	return render(request, "generics/generic_form.html", context)	×
100
101
102	@login_required	1✔
103	def request_details(request, request_id):	1✔
104	request_list = get_objects_for_user(request.user, 'service_catalog.view_request')	1✔
105	target_request = get_object_or_404(request_list, id=request_id)	1✔
106	context = {'target_request': target_request,	1✔
107	'breadcrumbs': [
108	{'text': 'Requests', 'url': reverse('service_catalog:request_list')},
109	{'text': request_id, 'url': ""},
110	],
111	}
112	return render(request, 'service_catalog/common/request-details.html', context=context)	1✔

HewlettPackard / squest / 1962373523

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