Skip to content

Commit 5ec1c5e

Browse files
committed
[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
1 parent ad8e1ea commit 5ec1c5e

File tree

4 files changed

+4
-36
lines changed

4 files changed

+4
-36
lines changed

koalixcrm/version.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
# -*- coding: utf-8 -*-
2-
3-
KOALIXCRM_VERSION = "1.14.0-rc1"
1+
KOALIXCRM_VERSION = "1.14.0-rc2"

projectsettings/dashboard.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from django.utils.translation import gettext_lazy as _
1010
from grappelli.dashboard import modules, Dashboard
11-
from grappelli.dashboard.utils import get_admin_site_name
1211
from koalixcrm.version import KOALIXCRM_VERSION
1312

1413

@@ -19,7 +18,7 @@ class CustomIndexDashboard(Dashboard):
1918

2019
def init_with_context(self, context):
2120
self.children.append(modules.Group(
22-
_('koalixcrm Version' + KOALIXCRM_VERSION),
21+
_('koalixcrm Version ' + KOALIXCRM_VERSION),
2322
column=1,
2423
collapsible=True,
2524
children=[

projectsettings/settings/base_settings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@
9494
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
9595

9696
MEDIA_URL = "/media/"
97-
MEDIA_ROOT = os.path.join(BASE_DIR)
97+
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
9898

9999
PROJECT_ROOT = BASE_DIR
100100

101101
# Settings specific for koalixcrm
102102
PDF_OUTPUT_ROOT = os.path.join(STATIC_ROOT, 'pdf')
103103

104104
# Settings specific for filebrowser
105-
FILEBROWSER_DIRECTORY = 'media/uploads/'
105+
FILEBROWSER_DIRECTORY = 'uploads/'
106106
FILEBROWSER_EXTENSIONS = {
107107
'XML': ['.xml'],
108108
'XSL': ['.xsl'],

projectsettings/settings/production_docker_postgres_settings.py

-29
This file was deleted.

0 commit comments

Comments
 (0)