* Use the Influence summary, where appropriate.

[matthijs/projects/xerxes.git] / urls.py

diff --git a/urls.py b/urls.py
index a26fa4aac7220db95666327660f725bde33b6255..0483644b193f55511fe3dd60c2c8b81ab331f824 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -1,21 +1,30 @@
 from django.conf import settings
 from django.conf.urls.defaults import *
 from ee.influences.models import Character
+from ee.influences.models import Influence
 
 chars_dict = {
     'queryset': Character.objects.all(),
 }
  
+influences_dict = {
+    'queryset': Influence.objects.all(),
+}
+ 
 urlpatterns = patterns('',
     url(r'^admin/', include('django.contrib.admin.urls')),
     url(r'^events/event/(?P<event_id>\d+)/$', 'ee.events.views.event.detail'),
     url(r'^events/event/(?P<event_id>\d+)/regs$', 'ee.events.views.event.regs'),
-    url(r'^influences/add/(\d+)/$', 'ee.influences.views.add', name='influences_add_influence_for_character'),
-    url(r'^influences/add/$', 'ee.influences.views.add', name='influences_add_influence'),
+
     url(r'^influences/$', 'ee.influences.views.index', name='influences_index'),
+    url(r'^influences/influence/add/(\d+)/$', 'ee.influences.views.add', name='influences_add_influence_for_character'),
+    url(r'^influences/influence/add/$', 'ee.influences.views.add', name='influences_add_influence'),
+    url(r'^influences/influence/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', influences_dict, name='influences_influence_detail'),
+    
     url(r'^influences/character/$', 'django.views.generic.list_detail.object_list', chars_dict, name='influences_character_list'),
     url(r'^influences/character/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', chars_dict, name='influences_character_detail'),
     url(r'^influences/character/add/$', 'ee.influences.views.addCharacter', name='influences_add_character'),
+
     url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}),
     url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login'),
 )