holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-12-26 08:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1075 - make view agnostic to format of incoming due date

Browse Source
This commit is contained in:
finnertysea 2023-03-17 13:12:03 -07:00
parent 95e14b2ee7
commit 21ccc83d69
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helpdesk/views/staff.py
View File

@ -10,7 +10,7 @@ from ..lib import format_time_spent
from ..templated_email import send_templated_mail
from collections import defaultdict
from copy import deepcopy
from datetime import date, datetime, timedelta
from datetime import date, datetime, time, timedelta
from django.conf import settings
from django.contrib.auth import get_user_model
from django.contrib.auth.decorators import user_passes_test
@ -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))