[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777
Chris Lamb
lamby at debian.org
Fri Jul 30 02:52:36 UTC 2010
The following commit has been merged in the master branch:
commit 47851eb304ba14264315f6b0017bdc102bd96915
Author: Chris Lamb <lamby at debian.org>
Date: Thu Jul 29 16:12:00 2010 -0400
Rename Entry => Build.
Signed-off-by: Chris Lamb <lamby at debian.org>
diff --git a/live_studio/build/admin.py b/live_studio/build/admin.py
index 303982b..1622be5 100644
--- a/live_studio/build/admin.py
+++ b/live_studio/build/admin.py
@@ -1,8 +1,8 @@
from django.contrib import admin
-from .models import Entry
+from .models import Build
-class EntryAdmin(admin.ModelAdmin):
+class BuildAdmin(admin.ModelAdmin):
pass
-admin.site.register(Entry, EntryAdmin)
+admin.site.register(Build, BuildAdmin)
diff --git a/live_studio/build/managers.py b/live_studio/build/managers.py
index 1069ae8..a0b4cc8 100644
--- a/live_studio/build/managers.py
+++ b/live_studio/build/managers.py
@@ -1,5 +1,5 @@
from django.db import models
-class EntryManager(models.Manager):
+class BuildManager(models.Manager):
def pop(self):
return self.filter(started__isnull=True)[0]
diff --git a/live_studio/build/models.py b/live_studio/build/models.py
index b731703..bfc184b 100644
--- a/live_studio/build/models.py
+++ b/live_studio/build/models.py
@@ -2,9 +2,9 @@ import datetime
from django.db import models
-from .managers import EntryManager
+from .managers import BuildManager
-class Entry(models.Model):
+class Build(models.Model):
config = models.ForeignKey('config.Config')
enqueued = models.DateTimeField(default=datetime.datetime.utcnow)
@@ -12,8 +12,7 @@ class Entry(models.Model):
finished = models.DateTimeField(null=True)
success = models.BooleanField(default=False)
- objects = EntryManager()
+ objects = BuildManager()
class Meta:
ordering = ('-enqueued',)
- verbose_name_plural = 'Entries'
diff --git a/live_studio/build/views.py b/live_studio/build/views.py
index 8e653c2..9d8b580 100644
--- a/live_studio/build/views.py
+++ b/live_studio/build/views.py
@@ -3,13 +3,13 @@ from django.contrib import messages
from django.shortcuts import get_object_or_404
from django.views.decorators.http import require_POST
-from .models import Entry
+from .models import Build
@require_POST
def enqueue(request, config_id):
config = get_object_or_404(request.user.configs, pk=config_id)
- Entry.objects.create(config=config)
+ Build.objects.create(config=config)
messages.add_message(request, messages.INFO, 'Enqueued.')
--
live-studio
More information about the debian-live-changes
mailing list