From 045ddffd39a525496d5111f7448c60139f2328d9 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Tue, 6 Oct 2020 08:25:14 +0200 Subject: [PATCH] Umbenennung Notfallhilfe --- .../templates/dasettings/groups_content.html | 6 +++--- dasettings/views.py | 2 +- recoverdir/forms.py | 2 +- recoverdir/models.py | 2 +- recoverdir/templates/recoverdir/rd_doc_del.html | 2 +- .../rd_elements_forms/rd_area_1_adddoc.html | 2 +- .../rd_elements_forms/rd_area_1_addfc.html | 2 +- .../rd_elements_forms/rd_area_1_addhl.html | 2 +- .../rd_elements_forms/rd_area_1_addtrust.html | 2 +- .../rd_elements_forms/rd_area_1_contact_del.html | 2 +- .../rd_elements_forms/rd_area_1_trust_del.html | 2 +- .../templates/recoverdir/rd_management.html | 10 +++++----- recoverdir/templates/recoverdir/rd_pers_add.html | 2 +- .../templates/recoverdir/rd_pers_update.html | 2 +- recoverdir/views.py | 2 +- users/models.py | 2 +- users/templates/users/base.html | 2 +- users/views.py | 16 ++++++++-------- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html index ae87434..d7d6af9 100644 --- a/dasettings/templates/dasettings/groups_content.html +++ b/dasettings/templates/dasettings/groups_content.html @@ -35,11 +35,11 @@
Gruppenrechte{% if request.user.profile.showtooltips %} {% endif %}
- {% if aggroup.agencygroupname != "Notfallordner" %} + {% if aggroup.agencygroupname != "Notfallhilfe" %}
{% for perm in perms %} - {% if perm.help_text != "Notfallordner verwalten" %} + {% if perm.help_text != "Notfallhilfe verwalten" %} {% if forloop.counter|divisibleby:8 %}
@@ -59,7 +59,7 @@

{% else %} - Der Notfallordner ist für keine weiteren Rechte konfigurierbar. + Die Gruppe Notfallhilfe ist für keine weiteren Rechte konfigurierbar.
{% endif %}
diff --git a/dasettings/views.py b/dasettings/views.py index 081f08c..136bae0 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -166,7 +166,7 @@ def DASettings(request): if request.user.profile.agency.module_recoverdir: agencygroups = AgencyGroup.objects.filter(agency__pk=request.user.profile.agency.pk).order_by("agencygroupname").order_by("-savefordel") else: - agencygroups = AgencyGroup.objects.filter(agency__pk=request.user.profile.agency.pk).order_by("agencygroupname").order_by("-savefordel").exclude(agencygroupname="Notfallordner") + agencygroups = AgencyGroup.objects.filter(agency__pk=request.user.profile.agency.pk).order_by("agencygroupname").order_by("-savefordel").exclude(agencygroupname="Notfallhilfe") context.update({"agencygroups" : agencygroups}) diff --git a/recoverdir/forms.py b/recoverdir/forms.py index 50ceca6..f44387e 100644 --- a/recoverdir/forms.py +++ b/recoverdir/forms.py @@ -19,7 +19,7 @@ class PersLetterForm(forms.ModelForm): self.fields['text'] = forms.CharField(label="Ihr persönlicher Text", widget=forms.Textarea(attrs={"rows":15, "cols":35})) -# NOTFALLORDNER FORMS +# Notfallhilfe FORMS # 1 Handlungsleitfaden class HLForm(forms.ModelForm): diff --git a/recoverdir/models.py b/recoverdir/models.py index 296e962..5a6be12 100644 --- a/recoverdir/models.py +++ b/recoverdir/models.py @@ -26,7 +26,7 @@ class PersLetter(models.Model): text = encrypt(models.CharField(max_length=100000, blank=True, default="", null=True)) history = HistoricalRecords() -# Notfallordner Datenfelder +# Notfallhilfe Datenfelder # Handlungsleitfaden class Handlungsleitfaden(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) diff --git a/recoverdir/templates/recoverdir/rd_doc_del.html b/recoverdir/templates/recoverdir/rd_doc_del.html index 9f079af..6cd505e 100644 --- a/recoverdir/templates/recoverdir/rd_doc_del.html +++ b/recoverdir/templates/recoverdir/rd_doc_del.html @@ -15,6 +15,6 @@
{% else %} -

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

{% endif %} {% endblock content %} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html index 0cf9db5..990d52c 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html @@ -22,6 +22,6 @@ $("#id_document").on("change", function(){ }) {% else %} -

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

{% endif %} {% endblock content %} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html index f018363..9e8f59b 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html @@ -15,6 +15,6 @@
{% else %} -

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

{% endif %} {% endblock content %} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html index 04b341a..408ea21 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html @@ -33,6 +33,6 @@
{% else %} -

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

{% endif %} {% endblock content %} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addtrust.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addtrust.html index ecd0607..2542bbf 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addtrust.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addtrust.html @@ -15,6 +15,6 @@
{% else %} -

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

{% endif %} {% endblock content %} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html index 9081d62..255b43e 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html @@ -15,6 +15,6 @@ {% else %} -

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

{% endif %} {% endblock content %} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html index bef759f..9a82e8f 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html @@ -15,6 +15,6 @@ {% else %} -

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

{% endif %} {% endblock content %} diff --git a/recoverdir/templates/recoverdir/rd_management.html b/recoverdir/templates/recoverdir/rd_management.html index 483b275..6bdcfa4 100644 --- a/recoverdir/templates/recoverdir/rd_management.html +++ b/recoverdir/templates/recoverdir/rd_management.html @@ -3,15 +3,15 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Notfallordner{% if request.user.profile.showtooltips %} {% endif %} - +

Notfallhilfe{% if request.user.profile.showtooltips %} {% endif %} +