From 36b6d6bae36f4cd6bff6b16a75595d8d4793bc4b Mon Sep 17 00:00:00 2001 From: Tom Teichler <tom.teichler@teckids.org> Date: Sun, 14 Jun 2020 13:10:57 +0200 Subject: [PATCH] Move import, add tooltip --- aleksis/core/settings.py | 3 +-- aleksis/core/templates/core/pages/system_status.html | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index 22fa0ec43..5bbf6c4e2 100644 --- a/aleksis/core/settings.py +++ b/aleksis/core/settings.py @@ -424,7 +424,7 @@ if _settings.get("twilio.sid", None): TWILIO_CALLER_ID = _settings.get("twilio.callerid") if _settings.get("celery.enabled", False): - INSTALLED_APPS += ("django_celery_beat", "django_celery_results") + INSTALLED_APPS += ("django_celery_beat", "django_celery_results", "health_check.contrib.celery") CELERY_BROKER_URL = _settings.get("celery.broker", "redis://localhost") CELERY_RESULT_BACKEND = "django-db" CELERY_CACHE_BACKEND = "django-cache" @@ -654,7 +654,6 @@ elif HAYSTACK_BACKEND_SHORT == "whoosh": if _settings.get("celery.enabled", False) and _settings.get("search.celery", True): INSTALLED_APPS.append("celery_haystack") - INSTALLED_APPS.append("health_check.contrib.celery") HAYSTACK_SIGNAL_PROCESSOR = "celery_haystack.signals.CelerySignalProcessor" else: HAYSTACK_SIGNAL_PROCESSOR = "haystack.signals.RealtimeSignalProcessor" diff --git a/aleksis/core/templates/core/pages/system_status.html b/aleksis/core/templates/core/pages/system_status.html index f2c3eda35..f1493bbf8 100644 --- a/aleksis/core/templates/core/pages/system_status.html +++ b/aleksis/core/templates/core/pages/system_status.html @@ -63,6 +63,7 @@ </div> </div> + {# Health checks #} <div class="card"> <div class="card-content"> <span class="card-title"> {% blocktrans %}System health checks{% endblocktrans %}</span> @@ -80,11 +81,13 @@ {% for plugin in plugins %} <tr> <td> + <a class="tooltipped" data-position="top" data-tooltip="{{ plugin.pretty_status }}"> {% if plugin.status %} <i class="material-icons green-text" aria-hidden="true">check</i> {% else %} <i class="material-icons red-text" aria-hidden="true">warning</i> {% endif %} + </a> </td> <td>{{ plugin.identifier }}</td> <td> -- GitLab