mirror of https://gitlab.crans.org/bde/nk20
fix some breaking changes and linters
This commit is contained in:
parent
516a7f4be5
commit
d228dbf225
|
@ -26,7 +26,7 @@ from permission.backends import PermissionBackend
|
||||||
from permission.models import Role
|
from permission.models import Role
|
||||||
from permission.views import ProtectQuerysetMixin, ProtectedCreateView
|
from permission.views import ProtectQuerysetMixin, ProtectedCreateView
|
||||||
|
|
||||||
from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm,\
|
from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \
|
||||||
CustomAuthenticationForm, MembershipRolesForm
|
CustomAuthenticationForm, MembershipRolesForm
|
||||||
from .models import Club, Membership
|
from .models import Club, Membership
|
||||||
from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable
|
from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable
|
||||||
|
|
|
@ -13,7 +13,7 @@ from rest_framework import status
|
||||||
from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet
|
from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet
|
||||||
from permission.backends import PermissionBackend
|
from permission.backends import PermissionBackend
|
||||||
|
|
||||||
from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\
|
from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer, \
|
||||||
TemplateCategorySerializer, TransactionTemplateSerializer, TransactionPolymorphicSerializer, \
|
TemplateCategorySerializer, TransactionTemplateSerializer, TransactionPolymorphicSerializer, \
|
||||||
TrustSerializer
|
TrustSerializer
|
||||||
from ..models.notes import Note, Alias, NoteUser, NoteClub, NoteSpecial, Trust
|
from ..models.notes import Note, Alias, NoteUser, NoteClub, NoteSpecial, Trust
|
||||||
|
|
|
@ -10,7 +10,7 @@ from django.urls import reverse
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from permission.models import Role
|
from permission.models import Role
|
||||||
|
|
||||||
from ..api.views import AliasViewSet, ConsumerViewSet, NotePolymorphicViewSet, TemplateCategoryViewSet,\
|
from ..api.views import AliasViewSet, ConsumerViewSet, NotePolymorphicViewSet, TemplateCategoryViewSet, \
|
||||||
TransactionTemplateViewSet, TransactionViewSet
|
TransactionTemplateViewSet, TransactionViewSet
|
||||||
from ..models import NoteUser, Transaction, TemplateCategory, TransactionTemplate, RecurrentTransaction, \
|
from ..models import NoteUser, Transaction, TemplateCategory, TransactionTemplate, RecurrentTransaction, \
|
||||||
MembershipTransaction, SpecialTransaction, NoteSpecial, Alias, Note
|
MembershipTransaction, SpecialTransaction, NoteSpecial, Alias, Note
|
||||||
|
|
|
@ -44,6 +44,8 @@ class PermissionOAuth2Validator(OAuth2Validator):
|
||||||
subset of permissions.
|
subset of permissions.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
oidc_claim_scope = None # fix breaking change of django-oauth-toolkit 2.0.0
|
||||||
|
|
||||||
valid_scopes = set()
|
valid_scopes = set()
|
||||||
|
|
||||||
for t in Permission.PERMISSION_TYPES:
|
for t in Permission.PERMISSION_TYPES:
|
||||||
|
|
|
@ -5,7 +5,7 @@ from django_filters.rest_framework import DjangoFilterBackend
|
||||||
from rest_framework.filters import SearchFilter
|
from rest_framework.filters import SearchFilter
|
||||||
from api.viewsets import ReadProtectedModelViewSet
|
from api.viewsets import ReadProtectedModelViewSet
|
||||||
|
|
||||||
from .serializers import InvoiceSerializer, ProductSerializer, RemittanceTypeSerializer, RemittanceSerializer,\
|
from .serializers import InvoiceSerializer, ProductSerializer, RemittanceTypeSerializer, RemittanceSerializer, \
|
||||||
SogeCreditSerializer
|
SogeCreditSerializer
|
||||||
from ..models import Invoice, Product, RemittanceType, Remittance, SogeCredit
|
from ..models import Invoice, Product, RemittanceType, Remittance, SogeCredit
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
from django.urls import path
|
from django.urls import path
|
||||||
|
|
||||||
from .views import InvoiceCreateView, InvoiceListView, InvoiceUpdateView, InvoiceDeleteView, InvoiceRenderView,\
|
from .views import InvoiceCreateView, InvoiceListView, InvoiceUpdateView, InvoiceDeleteView, InvoiceRenderView, \
|
||||||
RemittanceListView, RemittanceCreateView, RemittanceUpdateView, LinkTransactionToRemittanceView,\
|
RemittanceListView, RemittanceCreateView, RemittanceUpdateView, LinkTransactionToRemittanceView, \
|
||||||
UnlinkTransactionToRemittanceView, SogeCreditListView, SogeCreditManageView
|
UnlinkTransactionToRemittanceView, SogeCreditListView, SogeCreditManageView
|
||||||
|
|
||||||
app_name = 'treasury'
|
app_name = 'treasury'
|
||||||
|
|
|
@ -25,8 +25,8 @@ admin_site.register(Site, SiteAdmin)
|
||||||
|
|
||||||
# Add external apps model
|
# Add external apps model
|
||||||
if "oauth2_provider" in settings.INSTALLED_APPS:
|
if "oauth2_provider" in settings.INSTALLED_APPS:
|
||||||
from oauth2_provider.admin import Application, ApplicationAdmin, Grant, \
|
from oauth2_provider.admin import ApplicationAdmin, GrantAdmin, AccessTokenAdmin, RefreshTokenAdmin
|
||||||
GrantAdmin, AccessToken, AccessTokenAdmin, RefreshToken, RefreshTokenAdmin
|
from oauth2_provider.model import Application, Grant, AccessToken, RefreshToken
|
||||||
admin_site.register(Application, ApplicationAdmin)
|
admin_site.register(Application, ApplicationAdmin)
|
||||||
admin_site.register(Grant, GrantAdmin)
|
admin_site.register(Grant, GrantAdmin)
|
||||||
admin_site.register(AccessToken, AccessTokenAdmin)
|
admin_site.register(AccessToken, AccessTokenAdmin)
|
||||||
|
|
|
@ -263,6 +263,9 @@ OAUTH2_PROVIDER = {
|
||||||
'REFRESH_TOKEN_EXPIRE_SECONDS': timedelta(days=14),
|
'REFRESH_TOKEN_EXPIRE_SECONDS': timedelta(days=14),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# PKCE (fix a breaking change of django-oauth-toolkit 2.0.0)
|
||||||
|
PKCE_REQUIRED = False
|
||||||
|
|
||||||
# Take control on how widget templates are sourced
|
# Take control on how widget templates are sourced
|
||||||
# See https://docs.djangoproject.com/en/2.2/ref/forms/renderers/#templatessetting
|
# See https://docs.djangoproject.com/en/2.2/ref/forms/renderers/#templatessetting
|
||||||
FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
|
FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
|
||||||
|
|
Loading…
Reference in New Issue