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

Add missing context to teamspeak join template.

Browse Source 
Closes #967
This commit is contained in:
Adarnof 2018-02-13 18:07:34 -05:00
parent 631bb439a4
commit 397ca97f0f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
<h1 class="page-header text-center">{% trans "Verify Teamspeak Identity" %}</h1> <h1 class="page-header text-center">{% trans "Verify Teamspeak Identity" %}</h1>
<div class="container-fluid"> <div class="container-fluid">
<div class="col-md-4 col-md-offset-4"> <div class="col-md-4 col-md-offset-4">
<a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}" class="btn btn-primary btn-block btn-lg" title="Join">{% trans "Join Server" %}</a> <a href="ts3server://{{ public_url }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}" class="btn btn-primary btn-block btn-lg" title="Join">{% trans "Join Server" %}</a>
<br/> <br/>
<form class="form-signin" role="form" action="{% url 'teamspeak3:verify' %}" method="POST"> <form class="form-signin" role="form" action="{% url 'teamspeak3:verify' %}" method="POST">
{% csrf_token %} {% csrf_token %}

4
allianceauth/services/modules/teamspeak3/views.py
View File

@ -3,7 +3,7 @@ import logging
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.decorators import login_required, permission_required
from django.shortcuts import render, redirect from django.shortcuts import render, redirect
from django.conf import settings
from .manager import Teamspeak3Manager from .manager import Teamspeak3Manager
from .forms import TeamspeakJoinForm from .forms import TeamspeakJoinForm
from .models import Teamspeak3User from .models import Teamspeak3User
@ -20,7 +20,6 @@ def activate_teamspeak3(request):
logger.debug("activate_teamspeak3 called by user %s" % request.user) logger.debug("activate_teamspeak3 called by user %s" % request.user)
character = request.user.profile.main_character character = request.user.profile.main_character
ticker = character.corporation_ticker
with Teamspeak3Manager() as ts3man: with Teamspeak3Manager() as ts3man:
logger.debug("Adding TS3 user for user %s with main character %s" % (request.user, character)) logger.debug("Adding TS3 user for user %s with main character %s" % (request.user, character))
result = ts3man.add_user(Teamspeak3Tasks.get_username(request.user)) result = ts3man.add_user(Teamspeak3Tasks.get_username(request.user))
@ -56,6 +55,7 @@ def verify_teamspeak3(request):
'form': form, 'form': form,
'authinfo': {'teamspeak3_uid': request.user.teamspeak3.uid, 'authinfo': {'teamspeak3_uid': request.user.teamspeak3.uid,
'teamspeak3_perm_key': request.user.teamspeak3.perm_key}, 'teamspeak3_perm_key': request.user.teamspeak3.perm_key},
'public_url': settings.TEAMSPEAK3_PUBLIC_URL,
} }
return render(request, 'services/teamspeak3/teamspeakjoin.html', context=context) return render(request, 'services/teamspeak3/teamspeakjoin.html', context=context)