Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-05 06:36:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed timerboard to Future/Past timers (#503)

Browse Source
This commit is contained in:
moriartyj
2016-07-18 11:07:22 -07:00
committed by Adarnof
parent c2c03de22a
commit 7e4d411685
3 changed files with 173 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/views.py
View File

@@ -419,12 +419,18 @@ def activate_teamspeak3(request):
logger.debug("activate_teamspeak3 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 TS3 user for blue user %s with main character %s" % (request.user, character))
result = Teamspeak3Manager.add_blue_user(character.character_name, character.corporation_ticker)
# 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 = Teamspeak3Manager.add_blue_user(character.character_name, ticker)
else:
logger.debug("Adding TS3 user for user %s with main character %s" % (request.user, character))
result = Teamspeak3Manager.add_user(character.character_name, character.corporation_ticker)
result = Teamspeak3Manager.add_user(character.character_name, ticker)
# if its empty we failed
if result[0] is not "":