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

Merged with R4stl1n master

Browse Source 
Had to resolve a small conflict in email. Replaced mine with upstream.
This commit is contained in:
Brett Costabile
2015-11-05 22:37:37 -05:00
parent c4069de4c5 b5133a55e8
commit 15e959b265
32 changed files with 374 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/managers/eve_api_manager.py
View File

@@ -140,10 +140,10 @@ class EveApiManager():
return False
@staticmethod
def get_alliance_standings():
if settings.ALLIANCE_EXEC_CORP_ID != "":
def get_corp_standings():
if settings.CORP_API_ID != "":
try:
api = evelink.api.API(api_key=(settings.ALLIANCE_EXEC_CORP_ID, settings.ALLIANCE_EXEC_CORP_VCODE))
api = evelink.api.API(api_key=(settings.CORP_API_ID, settings.CORP_API_VCODE))
corp = evelink.corp.Corp(api=api)
corpinfo = corp.contacts()
results = corpinfo[0]
@@ -178,4 +178,4 @@ class EveApiManager():
except evelink.api.APIError as error:
return False
return False
return False

2
services/managers/teamspeak3_manager.py
View File

@@ -138,7 +138,7 @@ class Teamspeak3Manager:
server_groups = Teamspeak3Manager._group_list()
if not settings.DEFAULT_ALLIANCE_GROUP in server_groups:
if not settings.DEFAULT_AUTH_GROUP in server_groups:
Teamspeak3Manager._create_group(settings.DEFAULT_ALLIANCE_GROUP)
alliance_group_id = Teamspeak3Manager._group_id_by_name(settings.DEFAULT_ALLIANCE_GROUP)

2
services/views.py
View File

@@ -91,7 +91,7 @@ def services_view(request):
def service_blue_alliance_test(user):
return check_if_user_has_permission(user, 'alliance_member') or check_if_user_has_permission(user, 'blue_member')
return check_if_user_has_permission(user, 'member') or check_if_user_has_permission(user, 'blue_member')
@login_required