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

Mumble uses alliance ticker for BLUES (#479)

Browse Source 
* Mumble uses alliance ticker for BLUES

* Move alliance ticker section for blues

* Fixed Reviewer translated link
This commit is contained in:
moriartyj 2016-06-26 07:18:48 -07:00 committed by Adarnof
parent c9e490a5c5
commit cb3dd1f393
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/views.py
View File

@ -7,6 +7,7 @@ from django.contrib.auth.decorators import user_passes_test
from django.contrib.auth.models import Group
from eveonline.models import EveCharacter
from eveonline.models import EveAllianceInfo
from authentication.models import AuthServicesInfo
from managers.openfire_manager import OpenfireManager
from managers.phpbb3_manager import Phpbb3Manager
@ -358,12 +359,18 @@ def activate_mumble(request):
logger.debug("activate_mumble called by user %s" % request.user)
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
character = EveManager.get_character_by_id(authinfo.main_char_id)
ticker = character.corporation_ticker
if check_if_user_has_permission(request.user, "blue_member"):
logger.debug("Adding mumble user for blue user %s with main character %s" % (request.user, character))
result = MumbleManager.create_blue_user(character.corporation_ticker, character.character_name)
# Blue members should have alliance ticker (if in alliance)
if EveAllianceInfo.objects.filter(alliance_id=character.alliance_id).exists():
alliance = EveAllianceInfo.objects.filter(alliance_id=character.alliance_id)[0]
ticker = alliance.alliance_ticker
result = MumbleManager.create_blue_user(ticker, character.character_name)
else:
logger.debug("Adding mumble user for user %s with main character %s" % (request.user, character))
result = MumbleManager.create_user(character.corporation_ticker, character.character_name)
result = MumbleManager.create_user(ticker, character.character_name)
# if its empty we failed
if result[0] is not "":
AuthServicesInfoManager.update_user_mumble_info(result[0], result[1], request.user)

2
stock/templates/registered/hrapplicationmanagement.html
View File

@ -132,7 +132,7 @@
<td class="text-center">
{% if app.approved_denied == None %}
{% if app.reviewer_str %}
<div class="label label-info">{% trans "Reviewer: {{ app.reviewer_str }}</div>
<div class="label label-info">{% trans "Reviewer:" %} {{ app.reviewer_str }}</div>
{% else %}
<div class="label label-warning">{% trans "Pending" %}</div>
{% endif %}