diff --git a/koalixcrm/version.py b/koalixcrm/version.py index 87fda557..30bf4725 100644 --- a/koalixcrm/version.py +++ b/koalixcrm/version.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - -KOALIXCRM_VERSION = "1.13.0" \ No newline at end of file +KOALIXCRM_VERSION = "1.14.0" diff --git a/projectsettings/dashboard.py b/projectsettings/dashboard.py index ada1d9a2..c55727d9 100644 --- a/projectsettings/dashboard.py +++ b/projectsettings/dashboard.py @@ -8,7 +8,6 @@ from django.utils.translation import gettext_lazy as _ from grappelli.dashboard import modules, Dashboard -from grappelli.dashboard.utils import get_admin_site_name from koalixcrm.version import KOALIXCRM_VERSION @@ -19,7 +18,7 @@ class CustomIndexDashboard(Dashboard): def init_with_context(self, context): self.children.append(modules.Group( - _('koalixcrm Version' + KOALIXCRM_VERSION), + _('koalixcrm Version ' + KOALIXCRM_VERSION), column=1, collapsible=True, children=[ diff --git a/projectsettings/settings/base_settings.py b/projectsettings/settings/base_settings.py index df5e6191..f60a8c0f 100644 --- a/projectsettings/settings/base_settings.py +++ b/projectsettings/settings/base_settings.py @@ -94,7 +94,7 @@ STATIC_ROOT = os.path.join(BASE_DIR, 'static') MEDIA_URL = "/media/" -MEDIA_ROOT = os.path.join(BASE_DIR) +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') PROJECT_ROOT = BASE_DIR @@ -102,7 +102,7 @@ PDF_OUTPUT_ROOT = os.path.join(STATIC_ROOT, 'pdf') # Settings specific for filebrowser -FILEBROWSER_DIRECTORY = 'media/uploads/' +FILEBROWSER_DIRECTORY = 'uploads/' FILEBROWSER_EXTENSIONS = { 'XML': ['.xml'], 'XSL': ['.xsl'], diff --git a/projectsettings/settings/production_docker_postgres_settings.py b/projectsettings/settings/production_docker_postgres_settings.py deleted file mode 100644 index 6c00a291..00000000 --- a/projectsettings/settings/production_docker_postgres_settings.py +++ /dev/null @@ -1,29 +0,0 @@ -""" -Django settings for koalixcrm project when used in productive environment. -""" - -from .base_settings import * - -SECRET_KEY = os.environ.get("SECRET_KEY") - -DEBUG = bool(os.environ.get("DEBUG", default=0)) - -# 'DJANGO_ALLOWED_HOSTS' should be a single string of hosts with a space between each. -# For example: 'DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]' -ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS").split(" ") - -DATABASES = { - "default": { - "ENGINE": os.environ.get("SQL_ENGINE", "django.db.backends.postgresql"), - "NAME": os.environ.get("SQL_DATABASE", BASE_DIR / "postgres"), - "USER": os.environ.get("SQL_USER", "postgres"), - "PASSWORD": os.environ.get("SQL_PASSWORD", "password"), - "HOST": os.environ.get("SQL_HOST", "localhost"), - "PORT": os.environ.get("SQL_PORT", "5432"), - } -} - -FOP_EXECUTABLE = "/usr/bin/fop-2.2/fop/fop" -GRAPPELLI_INDEX_DASHBOARD = 'projectsettings.dashboard.CustomIndexDashboard' -FILEBROWSER_CONVERT_FILENAME = False -KOALIXCRM_REST_API_AUTH = True \ No newline at end of file diff --git a/projectsettings/wsgi.py b/projectsettings/wsgi.py index 63759196..45a8ef94 100644 --- a/projectsettings/wsgi.py +++ b/projectsettings/wsgi.py @@ -1,16 +1,19 @@ """ -WSGI config for test_koalixcrm project. +WSGI config for koalixcrm project. -It exposes the WSGI callable as a module-level variable named ``application``. +This module contains the WSGI application used by Django's development server +and any production WSGI deployments. It should expose a module-level variable +named `application`. Django's `runserver` and `runfcgi` commands discover +this application via the `WSGI_APPLICATION` setting. -For more information on this file, see -https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +Usually this will be called "koalixcrm.wsgi". """ import os - from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_koalixcrm.settings") +# The settings module that Django uses. By convention, it is usually in the form "myproject.settings.production" +os.environ.setdefault("DJANGO_SETTINGS_MODULE", + "koalixcrm.projectsettings.settings.production_docker_postgres_settings") -application = get_wsgi_application() +application = get_wsgi_application() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 57320cb1..7e257ad0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --r requirements/prod_requirements.txt \ No newline at end of file +-r requirements/development_requirements.txt \ No newline at end of file diff --git a/requirements/development_requirements.txt b/requirements/development_requirements.txt index 9d379932..ccb07f16 100644 --- a/requirements/development_requirements.txt +++ b/requirements/development_requirements.txt @@ -1,9 +1,9 @@ -Django==3.2.20 +Django==3.2.25 django-filebrowser==3.14.3 lxml==5.1.0 olefile==0.46 -Pillow==7.1.2 -psycopg2-binary==2.8.4 +Pillow==10.3.0 +psycopg2-binary==2.9.9 pytz==2022.4 django-grappelli==2.15.7 djangorestframework==3.14.0 diff --git a/requirements/prod_requirements.txt b/requirements/prod_requirements.txt deleted file mode 100644 index 625cc8c5..00000000 --- a/requirements/prod_requirements.txt +++ /dev/null @@ -1,14 +0,0 @@ -Django==3.2.20 -django-filebrowser==3.14.3 -lxml==5.1.0 -olefile==0.46 -Pillow==7.1.2 -psycopg2-binary==2.8.4 -pytz==2022.4 -django-grappelli==2.15.7 -djangorestframework==3.14.0 -djangorestframework-xml==2.0.0 -markdown==3.1.1 -django-filter==23.5 -pandas==1.5.3 -matplotlib==3.7.5 diff --git a/setup.py b/setup.py index f54c09c2..a05d38d9 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ 'django-filebrowser==3.14.3', 'lxml==5.1.0', 'olefile==0.46', - "Pillow==10.2.0", - 'psycopg2-binary==2.8.4', + "Pillow==10.3.0", + 'psycopg2-binary==2.9.9', 'pytz==2022.4', 'django-grappelli==2.15.7', 'djangorestframework==3.14.0',