From 8d14ad4b341a3942ec272f945dfc79134cd8cef7 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 11 Oct 2020 12:46:52 +0200 Subject: [PATCH] Recht umgebaut --- adm/templates/adm/adm_user_single.html | 1 + .../templates/timemanagement/timemanagement_teamview.html | 6 +++++- timemanagement/views.py | 5 ++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/adm/templates/adm/adm_user_single.html b/adm/templates/adm/adm_user_single.html index bfb86c4..17deb7a 100644 --- a/adm/templates/adm/adm_user_single.html +++ b/adm/templates/adm/adm_user_single.html @@ -1,6 +1,7 @@ {% extends "adm/adm_base.html" %} {% block content %} {% load adm_tags %} +

{{user.get_full_name}} aus {{user.profile.agency.name}}


diff --git a/timemanagement/templates/timemanagement/timemanagement_teamview.html b/timemanagement/templates/timemanagement/timemanagement_teamview.html index e877d7a..25d0509 100644 --- a/timemanagement/templates/timemanagement/timemanagement_teamview.html +++ b/timemanagement/templates/timemanagement/timemanagement_teamview.html @@ -1,4 +1,8 @@ {% load counter_tag %} +
@@ -14,7 +18,7 @@ - {% for item in usersofagency %} + {% for item in usersofagencytm %} diff --git a/timemanagement/views.py b/timemanagement/views.py index 7ff883c..5712c9b 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -402,9 +402,8 @@ def TimeManagement(request, activemonth=False, activeyear=False): "workdays" : Workday.objects.filter(agency=request.user.profile.agency, user=request.user, start__month=activemonth, start__year=active_year).order_by("start").exclude(end=None), "userhasworkdays" : user_has_workdays } - - if(request.user.has_perm("users.usersmanager")): - context.update({"usersofagency" : User.objects.filter(profile__agency=request.user.profile.agency).order_by('last_name')}) + #if(request.user.has_perm("users.usersmanager")): + context.update({"usersofagencytm" : User.objects.filter(profile__agency=request.user.profile.agency).order_by('last_name')}) return render(request, 'timemanagement/timemanagement_management.html', context)
{{item.first_name }} {{ item.last_name }}