diff --git a/eveonline/views.py b/eveonline/views.py index f3bfb3b4..e6da28a0 100755 --- a/eveonline/views.py +++ b/eveonline/views.py @@ -138,22 +138,23 @@ def main_character_change(request, char_id): def corp_stats_view(request): # Get the corp the member is in auth_info = AuthServicesInfo.objects.get(user=request.user) - main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id) - if EveCorporationInfo.objects.filter(corporation_id=main_char.corporation_id).exists(): - current_count = 0 - allcharacters = {} - corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id) - all_characters = EveCharacter.objects.all() - for char in all_characters: - if char: - try: - if char.corporation_id == corp.corporation_id: - current_count = current_count + 1 - allcharacters[char.character_name] = EveApiKeyPair.objects.get(api_id=char.api_id) - except: - pass - context = {"corp": corp, - "currentCount": current_count, - "characters": allcharacters} - return render_to_response('registered/corpstats.html', context, context_instance=RequestContext(request)) + if EveCharacter.objects.filter(character_id=auth_info.main_char_id).exists(): + main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id) + if EveCorporationInfo.objects.filter(corporation_id=main_char.corporation_id).exists(): + current_count = 0 + allcharacters = {} + corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id) + all_characters = EveCharacter.objects.all() + for char in all_characters: + if char: + try: + if char.corporation_id == corp.corporation_id: + current_count = current_count + 1 + allcharacters[char.character_name] = EveApiKeyPair.objects.get(api_id=char.api_id) + except: + pass + context = {"corp": corp, + "currentCount": current_count, + "characters": allcharacters} + return render_to_response('registered/corpstats.html', context, context_instance=RequestContext(request)) return render_to_response('registered/corpstats.html', None, context_instance=RequestContext(request)) diff --git a/hrapplications/views.py b/hrapplications/views.py index f63fc928..7345e7f9 100755 --- a/hrapplications/views.py +++ b/hrapplications/views.py @@ -28,18 +28,20 @@ def hr_application_management_view(request): # Get the corp the member is in 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) - 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) - if EveCorporationInfo.objects.filter(corporation_id=main_char.corporation_id).exists(): - 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: + try: + main_corp_id = EveManager.get_charater_corporation_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): + main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id) + if EveCorporationInfo.objects.filter(corporation_id=main_char.corporation_id).exists(): + 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: + corp_applications = None + except: corp_applications = None - context = {'personal_apps': HRApplication.objects.all().filter(user=request.user), 'applications': corp_applications, 'search_form': HRApplicationSearchForm()}