From b1718abfc500deb538b48c2e281e240ce2febefa Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 16 Jul 2025 16:17:33 +0200 Subject: [PATCH] Removed legacy code --- codecov.yml | 1 - docker-compose.yml | 8 ++++---- .../core/commands/templates/settings.py.tpl | 4 ---- modoboa/core/dev_settings.py | 17 ----------------- modoboa/templates/404.html | 2 +- modoboa/templates/500.html | 2 +- modoboa/templates/layout_simple.html | 18 +++++------------- 7 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 modoboa/core/dev_settings.py diff --git a/codecov.yml b/codecov.yml index 2cbdc57bb..4f498a433 100644 --- a/codecov.yml +++ b/codecov.yml @@ -5,7 +5,6 @@ coverage: - "**/migrations/*" - "**/tests/*" - "**/tests.py" - - "modoboa/core/dev_settings.py" - "modoboa/test_settings.py" status: patch: diff --git a/docker-compose.yml b/docker-compose.yml index 047f7514d..b05099c0a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: dockerfile: docker/Dockerfile.dev environment: DB: "SQLITE" - DEBUG: "True" + DEBUG: 1 REDIS_HOST: redis PYTHONPATH: ".." PYTHONUNBUFFERED: 1 @@ -35,7 +35,7 @@ services: - test_project/envfile environment: DB: "SQLITE" - DEBUG: "True" + DEBUG: 1 REDIS_HOST: redis PYTHONPATH: ".." PYTHONUNBUFFERED: 1 @@ -64,7 +64,7 @@ services: - test_project/oidc_key environment: DB: "SQLITE" - DEBUG: "True" + DEBUG: 0 REDIS_HOST: redis PYTHONPATH: ".." PYTHONUNBUFFERED: 1 @@ -125,7 +125,7 @@ services: - test_project/oidc_key environment: DB: "SQLITE" - DEBUG: "True" + DEBUG: 1 REDIS_HOST: redis PYTHONPATH: ".." PYTHONUNBUFFERED: 1 diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl index 2d4c8d85b..7754b9c3b 100644 --- a/modoboa/core/commands/templates/settings.py.tpl +++ b/modoboa/core/commands/templates/settings.py.tpl @@ -11,10 +11,6 @@ https://docs.djangoproject.com/en/2.2/ref/settings/ from logging.handlers import SysLogHandler import os import environ -{% if devmode %} - -from modoboa.core.dev_settings import * # noqa -{% endif %} env = environ.Env() # Build paths inside the project like this: os.path.join(BASE_DIR, ...) diff --git a/modoboa/core/dev_settings.py b/modoboa/core/dev_settings.py deleted file mode 100644 index 21da259aa..000000000 --- a/modoboa/core/dev_settings.py +++ /dev/null @@ -1,17 +0,0 @@ -# Development settings - -import os - -BOWER_COMPONENTS_ROOT = os.path.join(os.path.dirname(__file__), "..") - -BOWER_INSTALLED_APPS = ( - "jquery#1.9", - "jquery-ui#1.11", - "bootstrap#3.3.7", - "d3#3.5.0", - "eonasdan-bootstrap-datetimepicker#4.17.47", - "font-awesome#4.7.0", - "c3#0.4.10", - "selectize#0.12.4", - "swagger-ui#3.24.3", -) diff --git a/modoboa/templates/404.html b/modoboa/templates/404.html index a0a5ba664..3602fa855 100644 --- a/modoboa/templates/404.html +++ b/modoboa/templates/404.html @@ -1,6 +1,6 @@ {% extends "layout_simple.html" %}{% load i18n %} {% block content %} -
+

{% trans "Sorry" %}

{% trans "The requested page does not exist." %}

diff --git a/modoboa/templates/500.html b/modoboa/templates/500.html index 810229bfa..33fcd80b1 100644 --- a/modoboa/templates/500.html +++ b/modoboa/templates/500.html @@ -1,6 +1,6 @@ {% extends "layout_simple.html" %}{% load i18n %} {% block content %} -
+

{% trans "Sorry" %}

{% trans "An internal error occured." %}

diff --git a/modoboa/templates/layout_simple.html b/modoboa/templates/layout_simple.html index 079f4e42c..f0378811e 100644 --- a/modoboa/templates/layout_simple.html +++ b/modoboa/templates/layout_simple.html @@ -3,24 +3,16 @@ + + {% block pagetitle %}{% endblock %} - - - - - + -
-
- {% block content %}{% endblock %} -
+
+ {% block content %}{% endblock %}