cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Switched from hardcoded settings to config

Browse source
This commit is contained in:
Dorian Lesbre 2021-02-19 11:46:42 +01:00
parent 46242ad2c0
commit beba3052dd
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gestioasso/settings/cof_prod.py
View file

@ -203,8 +203,3 @@ MAIL_DATA = {
"REPLYTO": "BdA-Revente <bda-revente@ens.fr>",
},
}
# Max lookback date into kfet history
KFET_HISTORY_DATE_LIMIT = timedelta(weeks=1)
# limite plus longue pour les chef/trez
KFET_HISTORY_LONG_DATE_LIMIT = timedelta(days=30)

15
kfet/forms.py
View file

@ -482,6 +482,16 @@ class KFetConfigForm(ConfigForm):
label="Durée pour annuler une commande sans mot de passe",
initial=timedelta(minutes=5),
)
kfet_history_limit = forms.DurationField(
label="Limite de confidentialité de l'historique",
initial=timedelta(days=7),
help_text="Les éléments plus vieux que cette durée seront masqués",
)
kfet_history_long_limit = forms.DurationField(
label="Limite de confidentialité de l'historique pour chef/trez",
initial=timedelta(days=30),
help_text="Limite plus longue en cas de problème de compta",
)
class FilterHistoryForm(forms.Form):
@ -489,10 +499,7 @@ class FilterHistoryForm(forms.Form):
label=_("De"),
widget=DateTimeWidget,
required=False,
help_text="Limité à {} jours ({} pour les chefs/trez)".format(
settings.KFET_HISTORY_DATE_LIMIT.days,
settings.KFET_HISTORY_LONG_DATE_LIMIT.days,
),
help_text="Limité pour raisons de confidentialité",
)
end = forms.DateTimeField(label=_("À"), widget=DateTimeWidget, required=False)
checkout = forms.ModelChoiceField(

4
kfet/views.py
View file

@ -1414,8 +1414,8 @@ def cancel_operations(request):
def get_history_limit(user) -> timedelta:
"""returns the earliest date the user can view history"""
if user.has_perm("access_old_history"):
return datetime.today() - settings.KFET_HISTORY_LONG_DATE_LIMIT
return datetime.today() - settings.KFET_HISTORY_DATE_LIMIT
return datetime.today() - kfet_config.history_long_limit
return datetime.today() - kfet_config.history_limit
@login_required