Minimal fixes

[redakcja.git] / src / redakcja / settings / __init__.py

diff --git a/src/redakcja/settings/__init__.py b/src/redakcja/settings/__init__.py
index 93fd5ca..f238349 100644 (file)
--- a/src/redakcja/settings/__init__.py
+++ b/src/redakcja/settings/__init__.py
@@ -1,11 +1,15 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-import os.path
+import os

 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 from .defaults import *
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 from .defaults import *

-from ..localsettings import *
+
+try:
+    from ..localsettings import *
+except ImportError:
+    pass

 
 DATA_UPLOAD_MAX_MEMORY_SIZE = 20000000
 
 
 DATA_UPLOAD_MAX_MEMORY_SIZE = 20000000
 


@@ -15,6 +19,16 @@ STATICFILES_DIRS = [
     PROJECT_ROOT + '/static/'
 ]
 
     PROJECT_ROOT + '/static/'
 ]
 

+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'HOST': 'db',
+        'USER': os.environ.get('POSTGRES_USER'),
+        'PASSWORD': os.environ.get('POSTGRES_PASSWORD'),
+        'NAME': os.environ.get('POSTGRES_USER'),
+    }
+}
+

 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',


@@ -69,6 +83,9 @@ if CAS_SERVER_URL:
 ROOT_URLCONF = 'redakcja.urls'
 
 INSTALLED_APPS = (
 ROOT_URLCONF = 'redakcja.urls'
 
 INSTALLED_APPS = (

+    'modeltranslation',
+    'reversion',
+

     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',


@@ -89,6 +106,7 @@ INSTALLED_APPS = (
     'bootstrap4',
     'rest_framework',
     'django_filters',
     'bootstrap4',
     'rest_framework',
     'django_filters',

+    'admin_ordering',

 
     'redakcja.api',
     'catalogue',
 
     'redakcja.api',
     'catalogue',


@@ -103,6 +121,9 @@ INSTALLED_APPS = (
     'email_mangler',
     'wlxml.apps.WlxmlConfig',
     'alerts',
     'email_mangler',
     'wlxml.apps.WlxmlConfig',
     'alerts',

+    'team',
+    'sources',
+    'isbn',

 )
 
 if DEBUG:
 )
 
 if DEBUG:


@@ -121,6 +142,8 @@ LEGIMI_BIG_WORDS = 10000
 LEGIMI_SMALL_PRICE = 7
 LEGIMI_BIG_PRICE = 20
 
 LEGIMI_SMALL_PRICE = 7
 LEGIMI_BIG_PRICE = 20
 

+THUMBNAIL_PRESERVE_FORMAT = True
+

 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',


@@ -140,14 +163,14 @@ PIPELINE = {
     'STYLESHEETS': {
         'detail': {
             'source_filenames': (
     'STYLESHEETS': {
         'detail': {
             'source_filenames': (

+                'css/html.scss',

                 'css/master.css',
                 'css/toolbar.css',
                 'css/gallery.css',
                 'css/history.css',
                 'css/summary.css',
                 'css/master.css',
                 'css/toolbar.css',
                 'css/gallery.css',
                 'css/history.css',
                 'css/summary.css',

-                'css/html.scss',

                 'css/imgareaselect-default.css',
                 'css/imgareaselect-default.css',

-                'css/dialogs.css',
+                'css/dialogs.scss',

 
                 'wiki/scss/splitter.scss',
                 'wiki/scss/visual.scss'
 
                 'wiki/scss/splitter.scss',
                 'wiki/scss/visual.scss'


@@ -192,8 +215,9 @@ PIPELINE = {
 
                 # base UI
                 'js/wiki/base.js',
 
                 # base UI
                 'js/wiki/base.js',

-                'wiki/js/sidebar-perspective.js',

                 'js/wiki/toolbar.js',
                 'js/wiki/toolbar.js',

+                'js/lib/diff.js',
+                'js/wiki/undo.js',

 
                 # dialogs
                 'js/wiki/dialog_save.js',
 
                 # dialogs
                 'js/wiki/dialog_save.js',


@@ -201,6 +225,7 @@ PIPELINE = {
                 'js/wiki/dialog_pubmark.js',
 
                 # views
                 'js/wiki/dialog_pubmark.js',
 
                 # views

+                'js/wiki/view_sidebar.js',

                 'js/wiki/view_history.js',
                 'js/wiki/view_summary.js',
                 'js/wiki/view_editor_source.js',
                 'js/wiki/view_history.js',
                 'js/wiki/view_summary.js',
                 'js/wiki/view_editor_source.js',


@@ -290,6 +315,16 @@ REST_FRAMEWORK = {
 }
 
 
 }
 
 

+LANGUAGES = [
+    ('pl', 'polski'),
+    ('de', 'Deutsch'),
+    ('lt', 'lietuvių'),
+]
+
+
+TEST_INTEGRATION = False
+
+

 try:
     SENTRY_DSN
 except NameError:
 try:
     SENTRY_DSN
 except NameError: