mirror of
https://github.com/django-helpdesk/django-helpdesk.git
synced 2025-03-04 18:22:58 +01:00
Merge pull request #836 from Benbb96/0.2.x
A ticket cannot depends on itself or on a ticket already depending on it
This commit is contained in:
commit
630cfd9179
@ -1475,16 +1475,17 @@ def ticket_dependency_add(request, ticket_id):
|
|||||||
raise PermissionDenied()
|
raise PermissionDenied()
|
||||||
if not _is_my_ticket(request.user, ticket):
|
if not _is_my_ticket(request.user, ticket):
|
||||||
raise PermissionDenied()
|
raise PermissionDenied()
|
||||||
if request.method == 'POST':
|
|
||||||
form = TicketDependencyForm(request.POST)
|
form = TicketDependencyForm(request.POST or None)
|
||||||
|
# A ticket cannot depends on itself or on a ticket already depending on it
|
||||||
|
form.fields['depends_on'].queryset = Ticket.objects.exclude(
|
||||||
|
Q(id=ticket.id) | Q(ticketdependency__depends_on=ticket)
|
||||||
|
)
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
ticketdependency = form.save(commit=False)
|
ticketdependency = form.save(commit=False)
|
||||||
ticketdependency.ticket = ticket
|
ticketdependency.ticket = ticket
|
||||||
if ticketdependency.ticket != ticketdependency.depends_on:
|
|
||||||
ticketdependency.save()
|
ticketdependency.save()
|
||||||
return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket.id]))
|
return HttpResponseRedirect(reverse('helpdesk:view', args=[ticket.id]))
|
||||||
else:
|
|
||||||
form = TicketDependencyForm()
|
|
||||||
return render(request, 'helpdesk/ticket_dependency_add.html', {
|
return render(request, 'helpdesk/ticket_dependency_add.html', {
|
||||||
'ticket': ticket,
|
'ticket': ticket,
|
||||||
'form': form,
|
'form': form,
|
||||||
|
Loading…
Reference in New Issue
Block a user