From 2afb975c07d312eb218c2afb3a48becf433d2c45 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 12 Oct 2020 15:17:51 +0200 Subject: [PATCH] Bugs behiben --- .../__pycache__/counter_tag.cpython-38.pyc | Bin 18982 -> 19331 bytes standards/templatetags/counter_tag.py | 13 +++++++++++++ .../timemanagement_management.html | 12 ++++++++++-- users/templates/users/base.html | 4 +++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index f646192a8a3f368471fc39b4b3214bcc54aa9db4..2688e446d6b9b6f84a56bdaf9537f2803c5ed7cc 100644 GIT binary patch delta 6047 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 diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index 6487b9a..1e4c872 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -32,6 +32,18 @@ def incvar(): b += 1 return '' +@register.filter(name="has_group_byname") +def has_group_byname(user, groupname): + in_group = False + if(user.profile.agency.module_recoverdir): + agroup = AgencyGroup.objects.filter(agency=user.profile.agency, agencygroupname=groupname)[0] + for g in user.groups.all(): + if g.name == agroup.group.name: + print("HIER") + in_group = True + + return in_group + @register.filter(name='has_group') def has_group(user, group_name): @@ -77,6 +89,7 @@ def usergperm(user, perm): stat = True return stat + @register.filter(name="useringroupbyid") def is_member(id, groupname): usertocheck = User.objects.get(pk=id) diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html index 5fd83db..664cb5b 100644 --- a/timemanagement/templates/timemanagement/timemanagement_management.html +++ b/timemanagement/templates/timemanagement/timemanagement_management.html @@ -12,11 +12,13 @@ {% if user|usergperm:"absencemanager" %} -
+