Skip to content

Commit 3223b4a

Browse files
committed
Fix migration variety
1 parent c4666ca commit 3223b4a

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

Diff for: backend/.env.example

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ PYTHON_VERSION=3.9.6
66
# Django
77
# ------------------------------------------------------------------------------
88
SECRET_KEY=
9+
DJANGO_LOG_LEVEL=
10+
DRF_API_LOGGER_DATABASE=
911

1012
# EMAIL
1113
# ------------------------------------------------------------------------------

Diff for: backend/core/settings.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386
}
387387

388388
DRF_API_LOGGER_DATABASE = os.getenv("DRF_API_LOGGER_DATABASE", False)
389-
DRF_LOGGER_QUEUE_MAX_SIZE = int(os.getenv("DRF_LOGGER_QUEUE_MAX_SIZE", 50)) # Default to 50 if not specified.
390-
DRF_LOGGER_INTERVAL = int(os.getenv("DRF_LOGGER_INTERVAL", 10)) # In Seconds, Default to 10 seconds if not specified.
391-
DRF_API_LOGGER_DEFAULT_DATABASE = os.getenv("DRF_API_LOGGER_DEFAULT_DATABASE", "default")
389+
# DRF_LOGGER_QUEUE_MAX_SIZE = int(os.getenv("DRF_LOGGER_QUEUE_MAX_SIZE", 50)) # Default to 50 if not specified.
390+
# DRF_LOGGER_INTERVAL = int(os.getenv("DRF_LOGGER_INTERVAL", 10)) # In Seconds, Default to 10 seconds if not specified.
391+
# DRF_API_LOGGER_DEFAULT_DATABASE = os.getenv("DRF_API_LOGGER_DEFAULT_DATABASE", "default")
392392
DRF_API_LOGGER_PATH_TYPE = os.getenv("DRF_API_LOGGER_PATH_TYPE", "FULL_PATH")

Diff for: backend/db.sqlite3

16 KB
Binary file not shown.

Diff for: backend/requirements.txt

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ aniso8601==7.0.0
22
appdirs==1.4.4
33
asgiref==3.3.4
44
black==21.5b2
5+
bleach==6.2.0
56
boto3==1.17.109
67
botocore==1.20.109
78
certifi==2021.5.30
@@ -29,6 +30,7 @@ django-truncate==0.1
2930
django-versatileimagefield==2.1
3031
djangorestframework==3.12.4
3132
djangorestframework-simplejwt==4.7.2
33+
drf-api-logger==1.1.16
3234
drf-flex-fields==0.9.1
3335
drf-yasg==1.20.0
3436
dynaconf==3.1.4
@@ -81,3 +83,4 @@ typing-extensions==3.10.0.0
8183
uritemplate==3.0.1
8284
urllib3==1.26.6
8385
validators==0.18.2
86+
webencodings==0.5.1

Diff for: backend/store/models.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@
2121

2222

2323
def upload_path(instance, filename: str) -> str:
24-
return "/".join(["images", str(instance.name), filename])
24+
return "/".join([str(instance.name), filename])
2525

2626

2727
def rand_slug() -> str:
2828
return "".join(
2929
random.choice(string.ascii_letters + string.digits) for _ in range(6)
3030
)
3131

32+
def get_default_image():
33+
return settings.MEDIA_ROOT + "/images/default_placeholder.png"
3234

3335
class Category(MPTTModel):
3436
"""
@@ -177,7 +179,7 @@ class Image(models.Model):
177179
ppoi_field="image_ppoi",
178180
# null=True,
179181
# blank=True,
180-
default=settings.MEDIA_ROOT + "/images/default_placeholder.png",
182+
default=get_default_image,
181183
placeholder_image=OnDiscPlaceholderImage(
182184
path=settings.MEDIA_ROOT + "/images/default_placeholder.png"
183185
),

0 commit comments

Comments
 (0)