mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-05 06:36:19 +01:00
Fix registration.
Fix state assignment. Fix character ownership transfer. Disable non-staff passwords. Fix dashboard groups panel placement. Fix corpstats viewmodel retrieval.
This commit is contained in:
@@ -7,20 +7,14 @@ def auth_settings(request):
|
||||
return {
|
||||
'DOMAIN': settings.DOMAIN,
|
||||
'MUMBLE_URL': settings.MUMBLE_URL,
|
||||
'FORUM_URL': settings.FORUM_URL,
|
||||
'FORUM_URL': settings.PHPBB3_URL,
|
||||
'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL,
|
||||
'DISCORD_SERVER_ID': settings.DISCORD_GUILD_ID,
|
||||
'KILLBOARD_URL': settings.KILLBOARD_URL,
|
||||
'DISCOURSE_URL': settings.DISCOURSE_URL,
|
||||
'IPS4_URL': settings.IPS4_URL,
|
||||
'SMF_URL': settings.SMF_URL,
|
||||
'MARKET_URL': settings.MARKET_URL,
|
||||
'EXTERNAL_MEDIA_URL': settings.EXTERNAL_MEDIA_URL,
|
||||
'CURRENT_UTC_TIME': timezone.now(),
|
||||
'BLUE_API_MASK': settings.BLUE_API_MASK,
|
||||
'BLUE_API_ACCOUNT': settings.BLUE_API_ACCOUNT,
|
||||
'MEMBER_API_MASK': settings.MEMBER_API_MASK,
|
||||
'MEMBER_API_ACCOUNT': settings.MEMBER_API_ACCOUNT,
|
||||
'JABBER_URL': settings.JABBER_URL,
|
||||
'SITE_NAME': settings.SITE_NAME,
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ def only_one(function=None, key="", timeout=None):
|
||||
|
||||
@app.task(bind=True)
|
||||
def validate_services(self, user):
|
||||
logger.debug('Ensuring user %s has permissions for active services'.format(user))
|
||||
logger.debug('Ensuring user {} has permissions for active services'.format(user))
|
||||
# Iterate through services hooks and have them check the validity of the user
|
||||
for svc in ServicesHook.get_services():
|
||||
try:
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.shortcuts import render
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from alliance_auth.hooks import get_hooks
|
||||
from eveonline.models import EveCharacter
|
||||
from services.forms import FleetFormatterForm
|
||||
|
||||
import logging
|
||||
@@ -47,7 +44,7 @@ def fleet_formatter_view(request):
|
||||
@login_required
|
||||
def services_view(request):
|
||||
logger.debug("services_view called by user %s" % request.user)
|
||||
char = request.profile.main_character
|
||||
char = request.user.profile.main_character
|
||||
context = {'service_ctrls': []}
|
||||
for fn in get_hooks('services_hook'):
|
||||
# Render hooked services controls
|
||||
|
||||
Reference in New Issue
Block a user