diff --git a/compensation/forms/modals/state.py b/compensation/forms/modals/state.py index f0c4221..5a1dde5 100644 --- a/compensation/forms/modals/state.py +++ b/compensation/forms/modals/state.py @@ -5,7 +5,7 @@ Contact: ksp-servicestelle@sgdnord.rlp.de Created on: 18.08.22 """ -from bootstrap_modal_forms.utils import is_ajax +from bootstrap_modal_forms.mixins import is_ajax from dal import autocomplete from django import forms from django.contrib import messages diff --git a/intervention/autocomplete/intervention.py b/intervention/autocomplete/intervention.py index 961c966..fdadc47 100644 --- a/intervention/autocomplete/intervention.py +++ b/intervention/autocomplete/intervention.py @@ -34,3 +34,9 @@ class InterventionAutocomplete(Select2QuerySetView): Q(title__icontains=self.q) ).distinct() return qs + + def get_result_label(self, result): + return str(result) + + def get_selected_result_label(self, result): + return str(result) diff --git a/konova/decorators.py b/konova/decorators.py index cbf45dc..47df9b2 100644 --- a/konova/decorators.py +++ b/konova/decorators.py @@ -8,7 +8,7 @@ Created on: 16.11.20 from functools import wraps -from bootstrap_modal_forms.utils import is_ajax +from bootstrap_modal_forms.mixins import is_ajax from django.contrib import messages from django.shortcuts import redirect, get_object_or_404, render from django.urls import reverse diff --git a/konova/forms/modals/base_form.py b/konova/forms/modals/base_form.py index a680657..96539cf 100644 --- a/konova/forms/modals/base_form.py +++ b/konova/forms/modals/base_form.py @@ -6,7 +6,7 @@ Created on: 15.08.22 """ from bootstrap_modal_forms.forms import BSModalForm -from bootstrap_modal_forms.utils import is_ajax +from bootstrap_modal_forms.mixins import is_ajax from django.contrib import messages from django.http import HttpResponseRedirect, HttpRequest from django.shortcuts import render diff --git a/requirements.txt b/requirements.txt index 79a479e..db28d0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,51 +1,56 @@ -amqp==5.0.9 -asgiref==3.3.1 -beautifulsoup4==4.9.3 -billiard==3.6.4.0 +amqp==5.1.1 +asgiref==3.7.2 +async-timeout==4.0.3 +beautifulsoup4==4.12.2 +billiard==4.1.0 cached-property==1.5.2 -celery==5.2.3 -certifi==2020.11.8 -chardet==3.0.4 -click==8.0.3 +celery==5.3.4 +certifi==2023.7.22 +chardet==5.2.0 +charset-normalizer==3.3.0 +click==8.1.7 click-didyoumean==0.3.0 click-plugins==1.1.1 -click-repl==0.2.0 -Deprecated==1.2.13 -Django==3.1.3 -django-autocomplete-light==3.9.0rc5 -django-bootstrap-modal-forms==2.2.0 -django-bootstrap4==3.0.1 -django-debug-toolbar==3.1.1 -django-filter==2.4.0 +click-repl==0.3.0 +coverage==7.3.2 +Deprecated==1.2.14 +Django==4.2.6 +django-autocomplete-light==3.10.0rc4 +django-bootstrap-modal-forms==3.0.4 +django-bootstrap4==23.2 +django-debug-toolbar==4.2.0 +django-filter==23.3 django-fontawesome-5==1.0.18 -django-simple-sso==1.1.0 -django-tables2==2.3.4 +django-simple-sso==1.2.0 +django-tables2==2.6.0 et-xmlfile==1.1.0 -idna==2.10 -importlib-metadata==2.1.1 -itsdangerous==0.24 -kombu==5.2.3 -openpyxl==3.0.9 -OWSLib==0.25.0 -packaging==21.3 -pika==1.2.0 -prompt-toolkit==3.0.24 -psycopg2-binary==2.9.1 -pyparsing==3.0.6 -pyproj==3.2.1 +idna==3.4 +importlib-metadata==6.8.0 +itsdangerous<1.0.0 +kombu==5.3.2 +openpyxl==3.2.0b1 +packaging==23.2 +pika==1.3.2 +prompt-toolkit==3.0.39 +psycopg2-binary==2.9.9 +pyparsing==3.1.1 +pypng==0.20220715.0 +pyproj==3.6.1 python-dateutil==2.8.2 -pytz==2021.3 -PyYAML==6.0 -qrcode==7.3.1 -redis==4.1.0 -requests==2.25.0 -six==1.15.0 -soupsieve==2.2.1 -sqlparse==0.4.1 -urllib3==1.26.2 +pytz==2023.3.post1 +PyYAML==6.0.1 +qrcode==7.4.2 +redis==5.0.1 +requests==2.31.0 +six==1.16.0 +soupsieve==2.5 +sqlparse==0.4.4 +typing_extensions==4.8.0 +tzdata==2023.3 +urllib3==2.0.6 vine==5.0.0 -wcwidth==0.2.5 +wcwidth==0.2.8 webservices==0.7 -wrapt==1.13.3 -xmltodict==0.12.0 -zipp==3.4.1 \ No newline at end of file +wrapt==1.16.0rc1 +xmltodict==0.13.0 +zipp==3.17.0 diff --git a/user/autocomplete/share.py b/user/autocomplete/share.py index 9331873..215e32c 100644 --- a/user/autocomplete/share.py +++ b/user/autocomplete/share.py @@ -29,6 +29,12 @@ class ShareUserAutocomplete(Select2QuerySetView): qs = qs.order_by("username") return qs + def get_result_label(self, result): + return str(result) + + def get_selected_result_label(self, result): + return str(result) + class ShareTeamAutocomplete(Select2QuerySetView): """ Autocomplete for share with teams @@ -52,3 +58,8 @@ class ShareTeamAutocomplete(Select2QuerySetView): ) return qs + def get_result_label(self, result): + return str(result) + + def get_selected_result_label(self, result): + return str(result) diff --git a/user/autocomplete/team.py b/user/autocomplete/team.py index c78053c..9cd9dc9 100644 --- a/user/autocomplete/team.py +++ b/user/autocomplete/team.py @@ -32,3 +32,8 @@ class TeamAdminAutocomplete(Select2QuerySetView): ) return qs + def get_result_label(self, result): + return str(result) + + def get_selected_result_label(self, result): + return str(result)