[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit 63e207d4c74f9e3be1fa022e7ef920b3fc64c7d1
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Jul 28 18:53:35 2010 -0400

    Rename 'config' view, url and template filename to 'view'

diff --git a/live_studio_www/config/models.py b/live_studio_www/config/models.py
index ac4d08f..b843577 100644
--- a/live_studio_www/config/models.py
+++ b/live_studio_www/config/models.py
@@ -82,4 +82,4 @@ class Config(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
-        return 'config:config', (self.pk,)
+        return 'config:view', (self.pk,)
diff --git a/live_studio_www/config/urls.py b/live_studio_www/config/urls.py
index 1261125..622c4a0 100644
--- a/live_studio_www/config/urls.py
+++ b/live_studio_www/config/urls.py
@@ -2,5 +2,5 @@ from django.conf.urls.defaults import *
 
 urlpatterns = patterns('live_studio_www.config.views',
     url(r'configs$', 'configs', name='configs'),
-    url(r'config/(?P<config_id>\d+)$', 'config', name='config'),
+    url(r'config/(?P<config_id>\d+)$', 'view', name='view'),
 )
diff --git a/live_studio_www/config/views.py b/live_studio_www/config/views.py
index 13fa6fb..b28d903 100644
--- a/live_studio_www/config/views.py
+++ b/live_studio_www/config/views.py
@@ -7,7 +7,7 @@ from .models import Config
 def configs(request):
     return render_response(request, 'config/configs.html')
 
-def config(request, config_id):
+def view(request, config_id):
     c = get_object_or_404(Config, pk=config_id, user=request.user)
 
     return render_response(request, 'config/config.html', {
diff --git a/templates/config/config.html b/templates/config/view.html
similarity index 100%
rename from templates/config/config.html
rename to templates/config/view.html

-- 
live-studio