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

Merge pull request #55 from tyler274/HRapplication_error

Browse Source 
Fix for hr_application bug
This commit is contained in:
Raynaldo Rivera 2015-01-30 19:49:59 -07:00
commit 1fb0397e3c
1 changed files with 120 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hrapplications/views.py
View File

@ -13,6 +13,9 @@ from eveonline.models import EveCorporationInfo
from eveonline.models import EveCharacter from eveonline.models import EveCharacter
from authentication.models import AuthServicesInfo from authentication.models import AuthServicesInfo
from django.conf import settings
from eveonline.managers import EveManager
@login_required @login_required
def hr_application_management_view(request): def hr_application_management_view(request):
@ -25,9 +28,13 @@ def hr_application_management_view(request):
# Get the corp the member is in # Get the corp the member is in
auth_info = AuthServicesInfo.objects.get(user=request.user) auth_info = AuthServicesInfo.objects.get(user=request.user)
if auth_info.main_char_id != "": if auth_info.main_char_id != "":
main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_id)
if main_alliance_id == settings.ALLIANCE_ID:
main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id) main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id)
corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id) corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None) corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
else:
corp_applications = None
context = {'personal_apps': HRApplication.objects.all().filter(user=request.user), context = {'personal_apps': HRApplication.objects.all().filter(user=request.user),
'applications': corp_applications, 'applications': corp_applications,