From 030e9a00a887ac3d1ae0b538402b710c595e952c Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Fri, 1 May 2020 13:38:36 +0200
Subject: [PATCH] Use existing hint instead of message if user's person is
DummyPerson
---
aleksis/core/models.py | 2 ++
aleksis/core/templates/core/no_person.html | 2 +-
aleksis/core/util/middlewares.py | 3 ---
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/aleksis/core/models.py b/aleksis/core/models.py
index d076019ea..74a656a61 100644
--- a/aleksis/core/models.py
+++ b/aleksis/core/models.py
@@ -256,6 +256,8 @@ class DummyPerson(Person):
managed = False
proxy = True
+ is_dummy = True
+
def save(self, *args, **kwargs):
pass
diff --git a/aleksis/core/templates/core/no_person.html b/aleksis/core/templates/core/no_person.html
index 3f506809a..2d4431f37 100644
--- a/aleksis/core/templates/core/no_person.html
+++ b/aleksis/core/templates/core/no_person.html
@@ -2,7 +2,7 @@
{% load i18n %}
-{% if not user.person and not user.is_anonymous %}
+{% if user.person.is_dummy or not user.person and not user.is_anonymous %}
<div class="alert error">
<div>
<i class="material-icons left">error</i>
diff --git a/aleksis/core/util/middlewares.py b/aleksis/core/util/middlewares.py
index 49d5c2e3e..bdedfa3ba 100644
--- a/aleksis/core/util/middlewares.py
+++ b/aleksis/core/util/middlewares.py
@@ -5,7 +5,6 @@ from django.http import HttpRequest, HttpResponse
from django.util.translation import gettext_lazy as _
from .core_helpers import has_person
-from .messages import warning
from ..models import DummyPerson
@@ -27,7 +26,5 @@ class EnsurePersonMiddleware:
dummy_person = DummyPerson(first_name=request.user.first_name, last_name=request.user.last_name)
request.user.person = dummy_person
- warning(request, _("A dummy user has been linked to your user account."))
-
response = self.get_response(request)
return response
--
GitLab