From 8aa7dc9ef61b7514555e48110e19614c056c3b7e Mon Sep 17 00:00:00 2001 From: ZoqkMaze <155395129+ZoqkMaze@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:16:45 +0200 Subject: [PATCH 1/2] rename helper function --- evap/contributor/views.py | 4 ++-- evap/evaluation/tools.py | 4 ++-- evap/staff/views.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/evap/contributor/views.py b/evap/contributor/views.py index 9fcac49b35..f16a9aab87 100644 --- a/evap/contributor/views.py +++ b/evap/contributor/views.py @@ -23,7 +23,7 @@ from evap.evaluation.tools import ( AttachmentResponse, get_object_from_dict_pk_entry_or_logged_40x, - get_parameter_from_url_or_session, + get_bool_parameter_from_url_or_session, sort_formset, ) from evap.results.exporters import ResultsExporter @@ -35,7 +35,7 @@ @responsible_or_contributor_or_delegate_required def index(request): user = request.user - show_delegated = get_parameter_from_url_or_session(request, "show_delegated", True) + show_delegated = get_bool_parameter_from_url_or_session(request, "show_delegated", True) represented_proxy_users = user.represented_users.filter(is_proxy_user=True) contributor_visible_states = [ diff --git a/evap/evaluation/tools.py b/evap/evaluation/tools.py index 45ca866bf5..568a9a92c8 100644 --- a/evap/evaluation/tools.py +++ b/evap/evaluation/tools.py @@ -170,7 +170,7 @@ def vote_end_datetime(vote_end_date: datetime.date) -> datetime.datetime: return date_to_datetime(vote_end_date) + datetime.timedelta(hours=24 + settings.EVALUATION_END_OFFSET_HOURS) -def get_parameter_from_url_or_session(request: HttpRequest, parameter: str, default=False) -> bool: +def get_bool_parameter_from_url_or_session(request: HttpRequest, parameter: str, default=False) -> bool: result_str = request.GET.get(parameter, None) if result_str is None: # if no parameter is given take session value result = request.session.get(parameter, default) @@ -180,7 +180,7 @@ def get_parameter_from_url_or_session(request: HttpRequest, parameter: str, defa return result -def get_string_from_url_or_session(request: HttpRequest, parameter: str, default: str | None = None) -> str | None: +def get_string_parameter_from_url_or_session(request: HttpRequest, parameter: str, default: str | None = None) -> str | None: result = request.GET.get(parameter, None) if result is None: result = request.session.get(parameter, default) diff --git a/evap/staff/views.py b/evap/staff/views.py index 68456792d1..1897e7b143 100644 --- a/evap/staff/views.py +++ b/evap/staff/views.py @@ -69,8 +69,8 @@ SaveValidFormMixin, StrOrPromise, get_object_from_dict_pk_entry_or_logged_40x, - get_parameter_from_url_or_session, - get_string_from_url_or_session, + get_bool_parameter_from_url_or_session, + get_string_parameter_from_url_or_session, sort_formset, temporary_receiver, ) @@ -1825,7 +1825,7 @@ def evaluation_preview(request, evaluation_id): @manager_required def questionnaire_index(request): filters = ["all", "visible", "archived"] - filter_questionnaires = get_string_from_url_or_session(request, "filter_questionnaires", filters[0]) + filter_questionnaires = get_string_parameter_from_url_or_session(request, "filter_questionnaires", filters[0]) if filter_questionnaires not in filters: raise SuspiciousOperation @@ -2323,7 +2323,7 @@ def user_index(request): @manager_required def user_list(request): - filter_users = get_parameter_from_url_or_session(request, "filter_users") + filter_users = get_bool_parameter_from_url_or_session(request, "filter_users") users = UserProfile.objects.all() if filter_users: From 05e1bf277704309180c2fd3f4775f7096ad6bc30 Mon Sep 17 00:00:00 2001 From: ZoqkMaze <155395129+ZoqkMaze@users.noreply.github.com> Date: Mon, 27 Apr 2026 20:29:31 +0200 Subject: [PATCH 2/2] format --- evap/contributor/views.py | 2 +- evap/evaluation/tools.py | 4 +++- evap/staff/views.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/evap/contributor/views.py b/evap/contributor/views.py index f16a9aab87..aa62b74576 100644 --- a/evap/contributor/views.py +++ b/evap/contributor/views.py @@ -22,8 +22,8 @@ ) from evap.evaluation.tools import ( AttachmentResponse, - get_object_from_dict_pk_entry_or_logged_40x, get_bool_parameter_from_url_or_session, + get_object_from_dict_pk_entry_or_logged_40x, sort_formset, ) from evap.results.exporters import ResultsExporter diff --git a/evap/evaluation/tools.py b/evap/evaluation/tools.py index 568a9a92c8..6dce63cb05 100644 --- a/evap/evaluation/tools.py +++ b/evap/evaluation/tools.py @@ -180,7 +180,9 @@ def get_bool_parameter_from_url_or_session(request: HttpRequest, parameter: str, return result -def get_string_parameter_from_url_or_session(request: HttpRequest, parameter: str, default: str | None = None) -> str | None: +def get_string_parameter_from_url_or_session( + request: HttpRequest, parameter: str, default: str | None = None +) -> str | None: result = request.GET.get(parameter, None) if result is None: result = request.session.get(parameter, default) diff --git a/evap/staff/views.py b/evap/staff/views.py index 1897e7b143..83ff6de5cf 100644 --- a/evap/staff/views.py +++ b/evap/staff/views.py @@ -68,8 +68,8 @@ HttpResponseNoContent, SaveValidFormMixin, StrOrPromise, - get_object_from_dict_pk_entry_or_logged_40x, get_bool_parameter_from_url_or_session, + get_object_from_dict_pk_entry_or_logged_40x, get_string_parameter_from_url_or_session, sort_formset, temporary_receiver,