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

Removed redundant function from tasks.py

Browse Source 
Added Corp/Alliance name switching to base template.
Fixed logic error in corp application filtering for hrapplication views.
This commit is contained in:
Adarnof
2015-11-06 03:22:21 +00:00
parent 8f8bc57567
commit 2a05b42c01
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hrapplications/views.py
View File

@@ -29,10 +29,11 @@ def hr_application_management_view(request):
auth_info = AuthServicesInfo.objects.get(user=request.user)
if auth_info.main_char_id != "":
main_corp_id = EveManager.get_charater_corporation_id_by_id(auth_info.main_char_id)
if main_corp_id == settings.CORP_ID:
main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_id)
if (settings.IS_CORP and main_corp_id == settings.CORP_ID) or (not settings.IS_CORP and main_alliance_id == settings.ALLIANCE_ID):
main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id)
corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
corp_applications = HRApplication.objects.filter(approved_denied=None)
corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
else:
corp_applications = None