[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777
Chris Lamb
lamby at debian.org
Fri Jul 30 02:52:35 UTC 2010
The following commit has been merged in the master branch:
commit ceb20d6bc2cf886478d362257dcf204159ace795
Author: Chris Lamb <lamby at debian.org>
Date: Thu Jul 29 16:10:00 2010 -0400
Rename 'queue' app and url namespace to 'build'.
Signed-off-by: Chris Lamb <lamby at debian.org>
diff --git a/config/settings/defaults/apps.py b/config/settings/defaults/apps.py
index fcd3b41..e82975b 100644
--- a/config/settings/defaults/apps.py
+++ b/config/settings/defaults/apps.py
@@ -7,9 +7,9 @@ INSTALLED_APPS = [
'django.contrib.messages',
'live_studio.auth',
+ 'live_studio.build',
'live_studio.utils',
'live_studio.debug',
- 'live_studio.queue',
'live_studio.config',
'live_studio.static',
'live_studio.templatetags',
diff --git a/live_studio/queue/__init__.py b/live_studio/build/__init__.py
similarity index 100%
rename from live_studio/queue/__init__.py
rename to live_studio/build/__init__.py
diff --git a/live_studio/queue/admin.py b/live_studio/build/admin.py
similarity index 100%
rename from live_studio/queue/admin.py
rename to live_studio/build/admin.py
diff --git a/live_studio/queue/management/__init__.py b/live_studio/build/management/__init__.py
similarity index 100%
rename from live_studio/queue/management/__init__.py
rename to live_studio/build/management/__init__.py
diff --git a/live_studio/queue/management/commands/__init__.py b/live_studio/build/management/commands/__init__.py
similarity index 100%
rename from live_studio/queue/management/commands/__init__.py
rename to live_studio/build/management/commands/__init__.py
diff --git a/live_studio/queue/management/commands/queue_runner.py b/live_studio/build/management/commands/queue_runner.py
similarity index 100%
rename from live_studio/queue/management/commands/queue_runner.py
rename to live_studio/build/management/commands/queue_runner.py
diff --git a/live_studio/queue/managers.py b/live_studio/build/managers.py
similarity index 100%
rename from live_studio/queue/managers.py
rename to live_studio/build/managers.py
diff --git a/live_studio/queue/models.py b/live_studio/build/models.py
similarity index 100%
rename from live_studio/queue/models.py
rename to live_studio/build/models.py
diff --git a/live_studio/queue/urls.py b/live_studio/build/urls.py
similarity index 71%
rename from live_studio/queue/urls.py
rename to live_studio/build/urls.py
index ea2af09..ea47f62 100644
--- a/live_studio/queue/urls.py
+++ b/live_studio/build/urls.py
@@ -1,6 +1,6 @@
from django.conf.urls.defaults import *
-urlpatterns = patterns('live_studio.queue.views',
+urlpatterns = patterns('live_studio.build.views',
url('config/(?P<config_id>\d+)/enqueue', 'enqueue',
name='enqueue'),
)
diff --git a/live_studio/queue/views.py b/live_studio/build/views.py
similarity index 100%
rename from live_studio/queue/views.py
rename to live_studio/build/views.py
diff --git a/live_studio/urls.py b/live_studio/urls.py
index 298ebe8..826754d 100644
--- a/live_studio/urls.py
+++ b/live_studio/urls.py
@@ -6,7 +6,7 @@ admin.autodiscover()
urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
(r'', include('live_studio.debug.urls', namespace='debug')),
- (r'', include('live_studio.queue.urls', namespace='queue')),
+ (r'', include('live_studio.build.urls', namespace='build')),
(r'', include('live_studio.config.urls', namespace='config')),
(r'', include('live_studio.static.urls', namespace='static')),
)
diff --git a/templates/config/view.html b/templates/config/view.html
index 782491c..ca513ea 100644
--- a/templates/config/view.html
+++ b/templates/config/view.html
@@ -6,7 +6,7 @@
<h1>Config: <em>{{ config.name }}</em></h1>
-<form action="{% url queue:enqueue config.pk %}" method="post">
+<form action="{% url build:enqueue config.pk %}" method="post">
<input type="submit" value="Build">
</form>
--
live-studio
More information about the debian-live-changes
mailing list