From 50d0d746f4852544106c49e62a45f2b885eb8583 Mon Sep 17 00:00:00 2001 From: Arona Date: Wed, 27 May 2020 18:52:03 +0200 Subject: [PATCH] Revert changes --- PyRIGS/settings.py | 2 +- RIGS/forms.py | 3 ++- RIGS/tests/test_functional.py | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 563c910c..4c86fc93 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -206,7 +206,7 @@ USE_L10N = True USE_TZ = True -DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M') +DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M')#, '%Y-%m-%dT%H:%M:%S') # Static files (CSS, JavaScript, Images) STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' diff --git a/RIGS/forms.py b/RIGS/forms.py index 413e14ae..19c29f2b 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -16,11 +16,12 @@ forms.DateField.widget = forms.DateInput(attrs={'type': 'date'}) forms.TimeField.widget = forms.TextInput(attrs={'type': 'time'}) forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'}) + # Events Shit class EventForm(forms.ModelForm): - datetime_input_formats = list(settings.DATETIME_INPUT_FORMATS) + datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + list(settings.DATETIME_INPUT_FORMATS) meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False) access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False) diff --git a/RIGS/tests/test_functional.py b/RIGS/tests/test_functional.py index d51fda56..f214cdbd 100644 --- a/RIGS/tests/test_functional.py +++ b/RIGS/tests/test_functional.py @@ -23,7 +23,6 @@ from django.test.client import Client from django.core import mail, signing from django.http import HttpResponseBadRequest from django.conf import settings -import sys @screenshot_failure_cls