From a027fd7582711bc330d48c5a2e16dc732a6ebaef Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sun, 1 Oct 2023 02:10:37 +0200 Subject: [PATCH] compat --- gawa/gawa/settings.py | 2 +- gawa/gawa/urls.py | 4 ++-- makemigrations.sh | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100755 makemigrations.sh diff --git a/gawa/gawa/settings.py b/gawa/gawa/settings.py index 25546ad..922b879 100644 --- a/gawa/gawa/settings.py +++ b/gawa/gawa/settings.py @@ -297,4 +297,4 @@ LOGGING = { #MEDIA_ROOT = "/home/plex/Documents/code/python/gawa/media" MEDIA_ROOT = "/app/media" MEDIA_URL = "/media/" -FILE_UPLOAD_TEMP_DIR = "/tmp/gawa/upload" +# FILE_UPLOAD_TEMP_DIR = "/tmp/gawa/upload" diff --git a/gawa/gawa/urls.py b/gawa/gawa/urls.py index 26c88d8..9647025 100644 --- a/gawa/gawa/urls.py +++ b/gawa/gawa/urls.py @@ -14,14 +14,14 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.conf.urls.i18n import i18n_patterns -from django.conf.urls import url from django.contrib import admin +from django.urls import include, re_path from django.urls import include, path from django.conf import settings from django.conf.urls.static import static urlpatterns = [ - url(r'^i18n/', include('django.conf.urls.i18n')), + re_path(r'^i18n/', include('django.conf.urls.i18n')), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += i18n_patterns( diff --git a/makemigrations.sh b/makemigrations.sh new file mode 100755 index 0000000..18d7725 --- /dev/null +++ b/makemigrations.sh @@ -0,0 +1,3 @@ +#!/bin/bash +docker compose exec main python /app/manage.py makemigrations +docker compose exec main python /app/manage.py migrate