Move characters from SSO to EVE API

eve_api/urls.py

@@ -8,4 +8,9 @@ urlpatterns = patterns('',
     url(r'^eveapi/delete/(?P<userid>\d+)/$', views.eveapi_del, name="eveapi-delete"),
     url(r'^eveapi/refresh/(?P<userid>\d+)/$', views.eveapi_refresh, name="eveapi-refresh"),
     url(r'^eveapi/log/(?P<userid>\d+)/$', views.eveapi_log, name="eveapi-log"),
+
+    url(r'^character/list/$', views.characters, name="eveapi-characters-list"),
+    url(r'^character/(?P<charid>.*)/$', views.characters, name="eveapi-character"),
+
+
 )

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))

sso/urls.py

@@ -11,8 +11,6 @@ urlpatterns = patterns('',
     (r'^profile/del/service/(?P<serviceid>\d+)/$', views.service_del),
     (r'^profile/reset/service/(?P<serviceid>\d+)/$', views.service_reset),
     (r'^profile/reset/service/(?P<serviceid>\d+)/(?P<accept>\d+)$', views.service_reset),
-    (r'^profile/characters$', views.characters),
-    (r'^profile/characters/(?P<charid>.*)/$', views.characters),
     (r'^profile/apipassword/', views.set_apipasswd),
     (r'^users/(?P<username>.*)/$', views.user_view),
     (r'^users/$', views.user_lookup),

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 """

templates/base.html

@@ -22,7 +22,7 @@
                 {% if "hr"|installed %}
                     <li><a href="{% url hr.views.index %}">HR</a></li>
                 {% endif %}
-                    <li><a href="{% url sso.views.characters %}">Characters</a></li>
+                    <li><a href="{% url eve_api.views.eveapi_character %}">Characters</a></li>
                 {% if request.user.is_staff %}
                     <li><a href="{% url sso.views.user_lookup %}">Lookup User</a></li>
                     <li><a href="/admin">Admin</a></li>