[Issue #327] ci: Removed unneeded production docker postgres settings…

… which will be part of the separate repository [Issue #327] ci: Update the koalixcrm version to 1.14.0-rc2
KoalixSwitzerland · Apr 7, 2024 · 5ec1c5e · 5ec1c5e
1 parent ad8e1ea
commit 5ec1c5e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 36 deletions.
diff --git a/koalixcrm/version.py b/koalixcrm/version.py
@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
-KOALIXCRM_VERSION = "1.14.0-rc1"
+KOALIXCRM_VERSION = "1.14.0-rc2"
diff --git 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
@@ -94,15 +94,15 @@
 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
 
 # Settings specific for koalixcrm
 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