Skip to content

Commit

Permalink
add global message
Browse files Browse the repository at this point in the history
  • Loading branch information
djbrown committed Oct 3, 2020
1 parent 372c298 commit 7bce212
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/base/admin.py
@@ -1,5 +1,6 @@
from django.contrib import admin

from .models import Env
from .models import Env, GlobalMessage

admin.site.register(Env)
admin.site.register(GlobalMessage)
6 changes: 4 additions & 2 deletions src/base/jinja2/base/base.j2
Expand Up @@ -4,8 +4,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description"
content="{% block description %}HbScorez ist eine Statistikplattform für diverse Handballigen im deutschsprachigen Raum.{% endblock %}">
<meta name="description" content="{% block description %}HbScorez ist eine Statistikplattform für diverse Handballigen im deutschsprachigen Raum.{% endblock %}">
<link rel="icon" href="{{ static('base/images/favicons/favicon.png') }}">

<title>{% block title %}HbScorez{% endblock %}</title>
Expand Down Expand Up @@ -66,6 +65,9 @@
</div>
{% endif %}
<main class="col-sm-12 ml-sm-auto">
{% if request.global_message %}
<div class="alert alert-primary" role="alert">{{ request.global_message.message|safe }}</div>
{% endif %}
{% block content %}{% endblock %}
</main>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/base/middleware/env.py
Expand Up @@ -24,6 +24,7 @@ def __call__(self, request):
# Code to be executed for each request before
# the view (and later middleware) are called.
request.env = {env.name: env.value for env in models.Env.objects.all()}
request.global_message = models.GlobalMessage.objects.first()

response = self.get_response(request)

Expand Down
20 changes: 20 additions & 0 deletions src/base/migrations/0002_globalmessage.py
@@ -0,0 +1,20 @@
# Generated by Django 3.1.2 on 2020-10-03 22:15

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('base', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='GlobalMessage',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('message', models.TextField()),
],
),
]
7 changes: 7 additions & 0 deletions src/base/models.py
Expand Up @@ -15,3 +15,10 @@ class Env(models.Model):
def set_value(self, value: Value):
self.value = value.value
self.save()


class GlobalMessage(models.Model):
message = models.TextField()

def __str__(self):
return self.message[:20]
3 changes: 3 additions & 0 deletions src/base/templates/base/base.html
Expand Up @@ -72,6 +72,9 @@ <h3>
</div>
{% endif %}
<main class="col-sm-12 ml-sm-auto">
{% if request.global_message %}
<div class="alert alert-primary" role="alert">{{ request.global_message.message|safe }}</div>
{% endif %}
{% block content %}{% endblock %}
</main>
</div>
Expand Down
Expand Up @@ -5,6 +5,6 @@

{% block content %}
<h1>Die Registrierung war nicht erfolgreich!</h1>
<div class="alert alert-danger mt-3">{{ activation_error.message }}</div>
<div class="alert alert-danger mt-3" role="alert">{{ activation_error.message }}</div>
<p><a class="btn btn-success" href="{% url 'django_registration_register' %}">Erneut Registrieren</a></p>
{% endblock %}

0 comments on commit 7bce212

Please sign in to comment.