mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-13 06:20:16 +02:00
Merge pull request #117 from Adarnof/hrapplicationfix
Added error handling for missing corp models.
This commit is contained in:
commit
58bcddc431
@ -139,21 +139,21 @@ def corp_stats_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)
|
||||||
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)
|
if EveCorporationInfo.objects.filter(corporation_id=main_char.corporation_id).exists():
|
||||||
current_count = 0
|
current_count = 0
|
||||||
allcharacters = {}
|
allcharacters = {}
|
||||||
all_characters = EveCharacter.objects.all()
|
corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
|
||||||
for char in all_characters:
|
all_characters = EveCharacter.objects.all()
|
||||||
if char:
|
for char in all_characters:
|
||||||
try:
|
if char:
|
||||||
if char.corporation_id == corp.corporation_id:
|
try:
|
||||||
current_count = current_count + 1
|
if char.corporation_id == corp.corporation_id:
|
||||||
allcharacters[char.character_name] = EveApiKeyPair.objects.get(api_id=char.api_id)
|
current_count = current_count + 1
|
||||||
except:
|
allcharacters[char.character_name] = EveApiKeyPair.objects.get(api_id=char.api_id)
|
||||||
pass
|
except:
|
||||||
|
pass
|
||||||
context = {"corp": corp,
|
context = {"corp": corp,
|
||||||
"currentCount": current_count,
|
"currentCount": current_count,
|
||||||
"characters": allcharacters}
|
"characters": allcharacters}
|
||||||
|
return render_to_response('registered/corpstats.html', context, context_instance=RequestContext(request))
|
||||||
return render_to_response('registered/corpstats.html', context, context_instance=RequestContext(request))
|
return render_to_response('registered/corpstats.html', None, context_instance=RequestContext(request))
|
||||||
|
@ -32,8 +32,11 @@ def hr_application_management_view(request):
|
|||||||
main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_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):
|
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)
|
main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id)
|
||||||
corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
|
if EveCorporationInfo.objects.filter(corporation_id=main_char.corporation_id).exists():
|
||||||
corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
|
corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
|
||||||
|
corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
|
||||||
|
else:
|
||||||
|
corp_applications = None
|
||||||
else:
|
else:
|
||||||
corp_applications = None
|
corp_applications = None
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
<h1 class="page-header text-center">Corporation Stats</h1>
|
<h1 class="page-header text-center">Corporation Stats</h1>
|
||||||
{% if perms.auth.member %}
|
{% if perms.auth.member %}
|
||||||
<div class="col-lg-12 container" id="example">
|
<div class="col-lg-12 container" id="example">
|
||||||
|
{% if corp %}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
@ -63,7 +63,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="container-fluid">
|
||||||
|
<div class="col-md-4 col-md-offset-4">
|
||||||
|
<div class="row">
|
||||||
|
<div class="alert alert-danger text-center" role="alert">No corporation model found. Contact your admin.</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user