From f7cde0b4dc7cc15a88ce7951dec3e98aae07eced Mon Sep 17 00:00:00 2001 From: Xevion Date: Sat, 31 Oct 2020 12:26:55 -0500 Subject: [PATCH] fix timezone setting, fix invalid default for CharField --- simple_viewer/settings.py | 2 +- viewer/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/simple_viewer/settings.py b/simple_viewer/settings.py index 4d87206..a412387 100644 --- a/simple_viewer/settings.py +++ b/simple_viewer/settings.py @@ -107,7 +107,7 @@ AUTH_PASSWORD_VALIDATORS = [ LANGUAGE_CODE = 'en-us' -TIME_ZONE = 'CST' +TIME_ZONE = 'US/Central' USE_I18N = True diff --git a/viewer/models.py b/viewer/models.py index aa378c7..9259d89 100644 --- a/viewer/models.py +++ b/viewer/models.py @@ -13,10 +13,10 @@ class ServedDirectory(models.Model): The regex pattern can be matched against the file path (False), or just the filename (True). """ - id = models.UUIDField(default=uuid.uuid4, primary_key=True, editable=False, unique=True) + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, unique=True) path = models.CharField('Directory Path', max_length=260) recursive = models.BooleanField('Files Are Matched Recursively', default=False) - regex_pattern = models.CharField('RegEx Matching Pattern', max_length=100, default=None) + regex_pattern = models.CharField('RegEx Matching Pattern', max_length=100, default='') regex = models.BooleanField('Directory RegEx Option', default=False) match_filename = models.BooleanField('RegEx Matches Against Filename', default=True)