nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 06:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added in-training skill to the character view, also cleaned up some views

Browse Source
This commit is contained in:
Andrew Williams
2011-03-16 16:00:35 +00:00
parent ae27be7e90
commit f9305af7c2
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/eve_api/views.py
View File

@@ -29,7 +29,6 @@ def eveapi_add(request, post_save_redirect='/'):
task.wait(10) task.wait(10)
except celery.exceptions.TimeoutError: except celery.exceptions.TimeoutError:
msg = "The addition of your API key is still processing, please check back in a minute or so." msg = "The addition of your API key is still processing, please check back in a minute or so."
pass
except DocumentRetrievalError: except DocumentRetrievalError:
msg = "An issue with the EVE API was encountered while adding your API, please try again later." msg = "An issue with the EVE API was encountered while adding your API, please try again later."
except: except:
@@ -86,16 +85,10 @@ def eveapi_refresh(request, userid, post_save_redirect='/'):
def eveapi_log(request, userid): def eveapi_log(request, userid):
""" Provides a list of access logs for a specific EVE API key """ """ Provides a list of access logs for a specific EVE API key """
try: acc = get_object_or_404(EVEAccount, id=userid)
acc = EVEAccount.objects.get(id=userid) if acc and (acc.user == request.user or request.user.is_staff):
except EVEAccount.DoesNotExist: logs = ApiAccessLog.objects.filter(userid=userid).order_by('-time_access')[:50]
pass return render_to_response('eve_api/log.html', locals(), context_instance=RequestContext(request))
else:
if acc and (acc.user == request.user or request.user.is_staff):
logs = ApiAccessLog.objects.filter(userid=userid).order_by('-time_access')[:50]
return render_to_response('eve_api/log.html', locals(), context_instance=RequestContext(request))
raise Http404
@login_required @login_required
@@ -104,6 +97,7 @@ def eveapi_character(request, charid=None):
if charid: if charid:
character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid) character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid)
current_training = character.eveplayercharacterskill_set.filter(in_training__gt=0)
skills = character.eveplayercharacterskill_set.all().order_by('skill__group__name', 'skill__name') skills = character.eveplayercharacterskill_set.all().order_by('skill__group__name', 'skill__name')
return render_to_response('eve_api/character.html', locals(), context_instance=RequestContext(request)) return render_to_response('eve_api/character.html', locals(), context_instance=RequestContext(request))
@@ -117,11 +111,7 @@ def eveapi_corporation(request, corporationid):
Provide details of a corporation, and for admins, a list of members Provide details of a corporation, and for admins, a list of members
""" """
try: corporation = get_object_or_404(EVEPlayerCorporation, id=corporationid)
corporation = EVEPlayerCorporation.objects.get(id=corporationid)
except EVEPlayerCorporation.DoesNotExist:
raise Http404
if request.user.is_superuser: if request.user.is_superuser:
view_members = True view_members = True
members = corporation.eveplayercharacter_set.all().order_by('corporation_date').only('id', 'name', 'corporation_date') members = corporation.eveplayercharacter_set.all().order_by('corporation_date').only('id', 'name', 'corporation_date')