From 884ec2535b0dfe5e1e4e6f65a5ed540bb684e6c2 Mon Sep 17 00:00:00 2001 From: Dorian Lesbre Date: Fri, 19 Feb 2021 11:51:48 +0100 Subject: [PATCH] Fixed stupid errors --- kfet/forms.py | 1 - kfet/views.py | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/kfet/forms.py b/kfet/forms.py index aba6d7c4..16b4963d 100644 --- a/kfet/forms.py +++ b/kfet/forms.py @@ -2,7 +2,6 @@ from datetime import timedelta from decimal import Decimal from django import forms -from django.conf import settings from django.contrib.auth.models import User from django.core import validators from django.core.exceptions import ValidationError diff --git a/kfet/views.py b/kfet/views.py index 859dc60d..e45c6508 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -6,7 +6,6 @@ from decimal import Decimal from typing import List from urllib.parse import urlencode -from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.mixins import PermissionRequiredMixin @@ -1411,11 +1410,15 @@ def cancel_operations(request): return JsonResponse(data) -def get_history_limit(user) -> timedelta: - """returns the earliest date the user can view history""" - if user.has_perm("access_old_history"): +def get_history_limit(user) -> datetime: + """returns the earliest date the given user can view history + according to his/her permissions""" + if user.has_perm("kfet.access_old_history"): return datetime.today() - kfet_config.history_long_limit - return datetime.today() - kfet_config.history_limit + if user.has_perm("kfet.is_team"): + return datetime.today() - kfet_config.history_limit + # should not happen - future earliest date + return datetime.today() + timedelta(days=1) @login_required