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

initial django3 bringup

Browse Source
This commit is contained in:
AaronKable 2020-09-18 11:45:37 +08:00
parent 3874aa6fee
commit ded9301527
46 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
allianceauth/authentication/forms.py
View File

@ -1,6 +1,8 @@
from django import forms
from django.utils.translation import ugettext_lazy as _
from allianceauth.authentication.models import User
class RegistrationForm(forms.Form):
email = forms.EmailField(label=_('Email'), max_length=254, required=True)
class _meta:
model = User

2
allianceauth/authentication/hmac_urls.py
View File

@ -10,5 +10,5 @@ urlpatterns = [
url(r'^register/$', views.RegistrationView.as_view(), name='registration_register'),
url(r'^register/complete/$', views.registration_complete, name='registration_complete'),
url(r'^register/closed/$', views.registration_closed, name='registration_disallowed'),
url(r'', include('registration.auth_urls')),
url(r'', include('django.contrib.auth.urls')),
]

2
allianceauth/authentication/templates/authentication/dashboard.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Dashboard" %}{% endblock %}

4
allianceauth/authentication/templates/public/register.html
View File

@ -1,7 +1,7 @@
{% load staticfiles %}
{% extends 'public/base.html' %}
{% load static %}
{% load bootstrap %}
{% load i18n %}
{% extends 'public/base.html' %}
{% block page_title %}Registration{% endblock %}
{% block extra_include %}
{% include 'bundles/bootstrap-css.html' %}

17
allianceauth/authentication/views.py
View File

@ -14,12 +14,12 @@ from allianceauth.eveonline.models import EveCharacter
from esi.decorators import token_required
from esi.models import Token
from registration.backends.hmac.views import (
from django_registration.backends.activation.views import (
RegistrationView as BaseRegistrationView,
ActivationView as BaseActivationView,
REGISTRATION_SALT
)
from registration.signals import user_registered
from django_registration.signals import user_registered
from .models import CharacterOwnership
from .forms import RegistrationForm
@ -134,12 +134,12 @@ def sso_login(request, token):
# Step 2
class RegistrationView(BaseRegistrationView):
form_class = RegistrationForm
success_url = 'authentication:dashboard'
template_name = "public/register.html"
email_body_template = "registration/activation_email.txt"
email_subject_template = "registration/activation_email_subject.txt"
def get_success_url(self, user):
if not getattr(settings, 'REGISTRATION_VERIFY_EMAIL', True):
return 'authentication:dashboard', (), {}
return super().get_success_url(user)
return reverse('registration_complete')
def dispatch(self, request, *args, **kwargs):
# We're storing a key in the session to pass user information from OAuth response. Make sure it's there.
@ -176,6 +176,11 @@ class RegistrationView(BaseRegistrationView):
# Step 3
class ActivationView(BaseActivationView):
template_name = "registration/activate.html"
def get_success_url(self, user):
return reverse('registration_activation_complete')
def validate_key(self, activation_key):
try:
dump = signing.loads(activation_key, salt=REGISTRATION_SALT,

2
allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Create Fatlink" %}{% endblock page_title %}

2
allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}

2
allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}

2
allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}

2
allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fatlink Corp Statistics" %}{% endblock page_title %}

2
allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fatlink statistics" %}{% endblock page_title %}

2
allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}

2
allianceauth/groupmanagement/templates/groupmanagement/audit.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{{ group }} {% trans "Audit Log" %}{% endblock page_title %}

2
allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% load evelinks %}

2
allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Groups Membership" %}{% endblock page_title %}

2
allianceauth/groupmanagement/templates/groupmanagement/groups.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Available Groups" %}{% endblock page_title %}

2
allianceauth/groupmanagement/templates/groupmanagement/index.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% load evelinks %}

2
allianceauth/groupmanagement/templates/groupmanagement/menu.html
View File

@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% load navactive %}

2
allianceauth/hrapplications/templates/hrapplications/corpchoice.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Choose a Corp" %}{% endblock page_title %}

2
allianceauth/hrapplications/templates/hrapplications/create.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %}

2
allianceauth/hrapplications/templates/hrapplications/management.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "HR Application Management" %}{% endblock page_title %}

2
allianceauth/hrapplications/templates/hrapplications/searchview.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}HR Application Management{% endblock page_title %}

2
allianceauth/hrapplications/templates/hrapplications/view.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load bootstrap %}
{% load i18n %}

2
allianceauth/notifications/templates/notifications/list.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Notifications" %}{% endblock %}

2
allianceauth/notifications/templates/notifications/view.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "View Notification" %}{% endblock page_title %}

2
allianceauth/optimer/templates/optimer/add.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}

2
allianceauth/optimer/templates/optimer/management.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}

2
allianceauth/optimer/templates/optimer/update.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}

2
allianceauth/permissions_tool/templates/permissions_tool/audit.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{{ permission.permission.codename }} - {% trans "Permissions Audit" %}{% endblock page_title %}

2
allianceauth/permissions_tool/templates/permissions_tool/overview.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Permissions Overview" %}{% endblock page_title %}

2
allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Jabber Broadcast" %}{% endblock page_title %}

2
allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Verify Teamspeak" %}{% endblock page_title %}

2
allianceauth/services/templates/services/fleetformattertool.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Fleet Formatter Tool" %}{% endblock page_title %}

2
allianceauth/services/templates/services/service_credentials.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% blocktrans with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktrans %}{% endblock page_title %}

2
allianceauth/services/templates/services/service_password.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% blocktrans with service_name=view.service_name|title %}{{ service_name }} Password Change{% endblocktrans %}{% endblock page_title %}

2
allianceauth/services/templates/services/services.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Services Management" %}{% endblock page_title %}

2
allianceauth/srp/templates/srp/add.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "SRP Fleet Create" %}{% endblock page_title %}

2
allianceauth/srp/templates/srp/data.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% load humanize %}

2
allianceauth/srp/templates/srp/management.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% load humanize %}

2
allianceauth/srp/templates/srp/request.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "SRP Request" %}{% endblock page_title %}

2
allianceauth/srp/templates/srp/update.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}

2
allianceauth/templates/allianceauth/top-menu.html
View File

@ -35,7 +35,7 @@
{% if user.is_staff %}
<li><a href="{% url 'admin:index' %}">{% trans "Admin" %}</a></li>
{% endif %}
<li><a href="{% url 'auth_logout' %}">{% trans "Logout" %}</a></li>
<li><a href="{% url 'logout' %}">{% trans "Logout" %}</a></li>
{% else %}
<li><a href="{% url 'authentication:login' %}">{% trans "Login" %}</a></li>
{% endif %}

2
allianceauth/templates/bundles/bootstrap-css.html
View File

@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
<!-- Bootstrap CSS -->
{% if NIGHT_MODE %}
{% if debug %}

2
allianceauth/timerboard/templates/timerboard/form.html
View File

@ -1,6 +1,6 @@
{% extends "allianceauth/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% block page_title %}

2
allianceauth/timerboard/templates/timerboard/view.html
View File

@ -1,5 +1,5 @@
{% extends "allianceauth/base.html" %}
{% load staticfiles %}
{% load static %}
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}
{% load evelinks %}

6
setup.py
View File

@ -22,12 +22,12 @@ install_requires = [
'celery>=4.3.0,<5.0.0,!=4.4.4', # 4.4.4 is missing a dependency
'celery_once',
'django>=2.2.1,<3.0',
'django>=3.1.1,<4.0.0 ',
'django-bootstrap-form',
'django-registration==2.4',
'django-registration>=3.1',
'django-sortedm2m',
'django-redis-cache>=2.1.0,<3.0.0',
'django-celery-beat>=1.1.1,<2.0.0',
'django-celery-beat>=2.0.0',
'openfire-restapi',
'sleekxmpp',