From: Matthijs Kooijman Date: Sun, 10 Feb 2008 14:37:28 +0000 (+0100) Subject: * Rename the add views to be a bit more consistent. X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fxerxes.git;a=commitdiff_plain;h=4747f5ee71f66f8ee68425fb7c3e544e6f2ff5b1 * Rename the add views to be a bit more consistent. --- diff --git a/influences/views.py b/influences/views.py index 85124e4..1ab2d22 100644 --- a/influences/views.py +++ b/influences/views.py @@ -24,7 +24,7 @@ class CharacterForm(ContextModelForm): fields = ('name') @login_required -def add(request, character_id=None): +def add_influence(request, character_id=None): initial = {} # Get the current user's characters chars = request.user.character_set.all() @@ -53,7 +53,7 @@ def add(request, character_id=None): return render_to_response('influences/add.html', {'form' : f}, RequestContext(request)) @login_required -def addCharacter(request): +def add_character(request): f = CharacterForm(request=request) if (f.is_valid()): character = f.save(commit=False) diff --git a/urls.py b/urls.py index 996e08a..fe0438f 100644 --- a/urls.py +++ b/urls.py @@ -11,12 +11,12 @@ urlpatterns = patterns('', 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/add/(\d+)/$', 'ee.influences.views.add_influence', name='influences_add_influence_for_character'), + url(r'^influences/influence/add/$', 'ee.influences.views.add_influence', name='influences_add_influence'), 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'^influences/character/add/$', 'ee.influences.views.add_character', name='influences_add_character'), url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}, name='login'), url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),