diff --git a/eve_api/urls.py b/eve_api/urls.py index 047a1ed..813e27a 100644 --- a/eve_api/urls.py +++ b/eve_api/urls.py @@ -8,4 +8,9 @@ urlpatterns = patterns('', url(r'^eveapi/delete/(?P\d+)/$', views.eveapi_del, name="eveapi-delete"), url(r'^eveapi/refresh/(?P\d+)/$', views.eveapi_refresh, name="eveapi-refresh"), url(r'^eveapi/log/(?P\d+)/$', views.eveapi_log, name="eveapi-log"), + + url(r'^character/list/$', views.characters, name="eveapi-characters-list"), + url(r'^character/(?P.*)/$', views.characters, name="eveapi-character"), + + ) diff --git a/eve_api/views.py b/eve_api/views.py index 0ae20dc..1034b66 100644 --- a/eve_api/views.py +++ b/eve_api/views.py @@ -89,3 +89,15 @@ def eveapi_log(request, userid): raise Http404 + +@login_required +def eveapi_character(request, charid=None): + """ Provide a list of characters, or a indivdual character sheet """ + + if charid: + character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid) + 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)) + + characters = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__alliance').filter(eveaccount__user=request.user).only('id', 'name', 'corporation__name', 'corporation__alliance__name') + return render_to_response('eve_api/character_list.html', locals(), context_instance=RequestContext(request)) diff --git a/sso/urls.py b/sso/urls.py index 4d0df48..edf0500 100644 --- a/sso/urls.py +++ b/sso/urls.py @@ -11,8 +11,6 @@ urlpatterns = patterns('', (r'^profile/del/service/(?P\d+)/$', views.service_del), (r'^profile/reset/service/(?P\d+)/$', views.service_reset), (r'^profile/reset/service/(?P\d+)/(?P\d+)$', views.service_reset), - (r'^profile/characters$', views.characters), - (r'^profile/characters/(?P.*)/$', views.characters), (r'^profile/apipassword/', views.set_apipasswd), (r'^users/(?P.*)/$', views.user_view), (r'^users/$', views.user_lookup), diff --git a/sso/views.py b/sso/views.py index ce00e54..4e3e0ed 100644 --- a/sso/views.py +++ b/sso/views.py @@ -38,19 +38,6 @@ def profile(request): return render_to_response('sso/profile.html', locals(), context_instance=RequestContext(request)) -@login_required -def characters(request, charid=0): - """ Provide a list of characters, or a indivdual character sheet """ - - if charid: - character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid) - skills = character.eveplayercharacterskill_set.all().order_by('skill__group__name', 'skill__name') - return render_to_response('sso/character.html', locals(), context_instance=RequestContext(request)) - - characters = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__alliance').filter(eveaccount__user=request.user).only('id', 'name', 'corporation__name', 'corporation__alliance__name') - return render_to_response('sso/characterlist.html', locals(), context_instance=RequestContext(request)) - - @login_required def service_add(request): """ Add a service to a user's account """ diff --git a/templates/base.html b/templates/base.html index 64dd033..5812018 100644 --- a/templates/base.html +++ b/templates/base.html @@ -22,7 +22,7 @@ {% if "hr"|installed %}
  • HR
  • {% endif %} -
  • Characters
  • +
  • Characters
  • {% if request.user.is_staff %}
  • Lookup User
  • Admin
  • diff --git a/templates/sso/character.html b/templates/eve_api/character.html similarity index 100% rename from templates/sso/character.html rename to templates/eve_api/character.html diff --git a/templates/sso/characterlist.html b/templates/eve_api/character_list.html similarity index 100% rename from templates/sso/characterlist.html rename to templates/eve_api/character_list.html