Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 14:30:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

[AA4] Fix dots in file names

Browse Source
This commit is contained in:
Erik Kalkoken 2024-02-22 03:00:47 +00:00 committed by Ariel Rin
parent 4d56030edf
commit 61f0aae5d9
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
allianceauth/authentication/templates/authentication/dashboard.characters.html → allianceauth/authentication/templates/authentication/dashboard_characters.html
View File

0
allianceauth/authentication/templates/authentication/dashboard.groups.html → allianceauth/authentication/templates/authentication/dashboard_groups.html
View File

29
allianceauth/authentication/views.py
View File

@ -1,8 +1,6 @@
import logging import logging
import requests import requests
from allianceauth.hooks import get_hooks
from django_registration.backends.activation.views import ( from django_registration.backends.activation.views import (
REGISTRATION_SALT, ActivationView as BaseActivationView, REGISTRATION_SALT, ActivationView as BaseActivationView,
RegistrationView as BaseRegistrationView, RegistrationView as BaseRegistrationView,
@ -34,7 +32,7 @@ from .models import CharacterOwnership
if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS: if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
_has_auto_groups = True _has_auto_groups = True
from allianceauth.eveonline.autogroups.models import * from allianceauth.eveonline.autogroups.models import * # noqa: F401, F403
else: else:
_has_auto_groups = False _has_auto_groups = False
@ -58,7 +56,7 @@ def dashboard_groups(request):
context = { context = {
'groups': groups, 'groups': groups,
} }
return render_to_string('authentication/dashboard.groups.html', context=context, request=request) return render_to_string('authentication/dashboard_groups.html', context=context, request=request)
def dashboard_characters(request): def dashboard_characters(request):
@ -70,7 +68,7 @@ def dashboard_characters(request):
context = { context = {
'characters': characters 'characters': characters
} }
return render_to_string('authentication/dashboard.characters.html', context=context, request=request) return render_to_string('authentication/dashboard_characters.html', context=context, request=request)
def dashboard_admin(request): def dashboard_admin(request):
@ -164,10 +162,12 @@ def main_character_change(request, token):
if co: if co:
request.user.profile.main_character = co.character request.user.profile.main_character = co.character
request.user.profile.save(update_fields=['main_character']) request.user.profile.save(update_fields=['main_character'])
messages.success(request, _('Changed main character to %(char)s') % { messages.success(request, _('Changed main character to %s') % co.character)
"char": co.character}) logger.info(
logger.info('Changed user %(user)s main character to %(char)s' % 'Changed user {user} main character to {char}'.format(
({'user': request.user, 'char': co.character})) user=request.user, char=co.character
)
)
return redirect("authentication:dashboard") return redirect("authentication:dashboard")
@ -222,8 +222,10 @@ def sso_login(request, token):
token.delete() token.delete()
messages.error( messages.error(
request, request,
_('Unable to authenticate as the selected character. ' _(
'Please log in with the main character associated with this account.') 'Unable to authenticate as the selected character. '
'Please log in with the main character associated with this account.'
)
) )
return redirect(settings.LOGIN_URL) return redirect(settings.LOGIN_URL)
@ -306,8 +308,7 @@ class RegistrationView(BaseRegistrationView):
else: else:
user.is_active = True user.is_active = True
user.save() user.save()
login(self.request, user, login(self.request, user, 'allianceauth.authentication.backends.StateBackend')
'allianceauth.authentication.backends.StateBackend')
return user return user
def get_activation_key(self, user): def get_activation_key(self, user):