holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1076 from finnertysea/#1075---add-options-for-date-and-datetime-input-in-ticket-view

Browse Source 
#1075 - make view agnostic to format of incoming due date
This commit is contained in:
Christopher Broderick 2023-03-26 00:47:56 +00:00 committed by GitHub
commit 747b6518fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
helpdesk/views/staff.py
View File

@ -24,7 +24,7 @@ from django.http import Http404, HttpResponse, HttpResponseRedirect, JsonRespons
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse, reverse_lazy
from django.utils import timezone
from django.utils.dateparse import parse_datetime
from django.utils.dateparse import parse_date, parse_datetime
from django.utils.html import escape
from django.utils.timezone import make_aware
from django.utils.translation import gettext as _
@ -521,7 +521,8 @@ def get_due_date_from_request_or_ticket(
due_date = request.POST.get('due_date', None) or None
if due_date is not None:
due_date = make_aware(parse_datetime(due_date))
parsed_date = parse_datetime(due_date) or datetime.combine(parse_date(due_date), time())
due_date = make_aware(parsed_date)
else:
due_date_year = int(request.POST.get('due_date_year', 0))
due_date_month = int(request.POST.get('due_date_month', 0))