X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=996e08a7c4ba617006c8957cdf1cda518c1d3acd;hb=0b494d055e958c91e98cc4bd2823e035bc140860;hp=c873e1a1f091ae50f4f2665d0e0841837a1bedb5;hpb=d137dd11f58dba71676c00d52cf0ac35c699a7b8;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/urls.py b/urls.py index c873e1a..996e08a 100644 --- a/urls.py +++ b/urls.py @@ -3,26 +3,19 @@ from django.conf.urls.defaults import * from ee.influences.models import Character from ee.influences.models import Influence import os - -chars_dict = { - 'queryset': Character.objects.all(), -} - -influences_dict = { - 'queryset': Influence.objects.all(), -} urlpatterns = patterns('', url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}), url(r'^admin/', include('django.contrib.admin.urls')), url(r'^influences/$', 'ee.influences.views.index', name='influences_index'), + url(r'^influences/influence/$', 'ee.influences.views.influence_list', name='influences_influence_list'), + url(r'^influences/influence/(?P\d+)/$', 'ee.influences.views.influence_detail', name='influences_influence_detail'), 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\d+)/$', 'ee.influences.views.influence_detail', influences_dict, name='influences_influence_detail'), - url(r'^influences/character/$', 'ee.influences.views.character_list', chars_dict, name='influences_character_list'), - url(r'^influences/character/(?P\d+)/$', 'ee.influences.views.character_detail', chars_dict, name='influences_character_detail'), + url(r'^influences/character/$', 'ee.influences.views.character_list', name='influences_character_list'), + url(r'^influences/character/(?P\d+)/$', 'ee.influences.views.character_detail', 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'}, name='login'),