[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777
Chris Lamb
lamby at debian.org
Fri Jul 30 02:52:34 UTC 2010
The following commit has been merged in the master branch:
commit 66b01f1d86426ee3403ea76bd0f5033cbabc6f5f
Author: Chris Lamb <lamby at debian.org>
Date: Thu Jul 29 10:51:34 2010 -0400
Add ability to enqueue configuration for building.
Signed-off-by: Chris Lamb <lamby at debian.org>
diff --git a/live_studio_www/queue/models.py b/live_studio_www/queue/models.py
index e69de29..7df1ced 100644
--- a/live_studio_www/queue/models.py
+++ b/live_studio_www/queue/models.py
@@ -0,0 +1,7 @@
+import datetime
+
+from django.db import models
+
+class Entry(models.Model):
+ config = models.ForeignKey('config.Config')
+ created = models.DateTimeField(default=datetime.datetime.utcnow)
diff --git a/live_studio_www/queue/urls.py b/live_studio_www/queue/urls.py
index 5438683..1e8c353 100644
--- a/live_studio_www/queue/urls.py
+++ b/live_studio_www/queue/urls.py
@@ -1,4 +1,6 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('live_studio_www.queue.views',
+ url('config/(?P<config_id>\d+)/enqueue', 'enqueue',
+ name='enqueue'),
)
diff --git a/live_studio_www/queue/views.py b/live_studio_www/queue/views.py
new file mode 100644
index 0000000..9a9413c
--- /dev/null
+++ b/live_studio_www/queue/views.py
@@ -0,0 +1,13 @@
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404
+from django.views.decorators.http import require_POST
+
+from .models import Entry
+
+ at require_POST
+def enqueue(request, config_id):
+ config = get_object_or_404(request.user.configs, pk=config_id)
+
+ Entry.objects.create(config=config)
+
+ return HttpResponseRedirect(config.get_absolute_url())
diff --git a/live_studio_www/urls.py b/live_studio_www/urls.py
index e424414..f4ae84e 100644
--- a/live_studio_www/urls.py
+++ b/live_studio_www/urls.py
@@ -6,7 +6,7 @@ admin.autodiscover()
urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
(r'', include('live_studio_www.debug.urls', namespace='debug')),
- (r'', include('live_studio_www.queue.urls', namespace='static')),
+ (r'', include('live_studio_www.queue.urls', namespace='queue')),
(r'', include('live_studio_www.config.urls', namespace='config')),
(r'', include('live_studio_www.static.urls', namespace='static')),
)
diff --git a/templates/config/view.html b/templates/config/view.html
index 8d72eb9..a6331ae 100644
--- a/templates/config/view.html
+++ b/templates/config/view.html
@@ -6,6 +6,10 @@
<h1>Config: <em>{{ config.name }}</em></h1>
+<form action="{% url queue:enqueue config.pk %}" method="post">
+<input type="submit" value="Build">
+</form>
+
<p><a href="{% url config:edit config.pk %}">Edit</a></p>
<dl>
--
live-studio
More information about the debian-live-changes
mailing list