[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 3149c7a63532530ec8851b3bddda210ab9301f63
Author: Chris Lamb <lamby at debian.org>
Date: Thu Jul 29 17:22:14 2010 -0400
Add Build.result_url instead of manually doing it the template.
Signed-off-by: Chris Lamb <lamby at debian.org>
diff --git a/live_studio/build/models.py b/live_studio/build/models.py
index c8f30ce..fb93265 100644
--- a/live_studio/build/models.py
+++ b/live_studio/build/models.py
@@ -2,6 +2,7 @@ import uuid
import datetime
from django.db import models
+from django.conf import settings
from .managers import BuildManager
@@ -29,3 +30,6 @@ class Build(models.Model):
if self.started:
return 'building'
return 'waiting'
+
+ def result_url(self):
+ return '%s/%s/%s' % (settings.BUILDS_URL, self.ident, self.filename)
diff --git a/templates/config/view.html b/templates/config/view.html
index 836c35f..b5d89ce 100644
--- a/templates/config/view.html
+++ b/templates/config/view.html
@@ -35,7 +35,7 @@
{% if build.status == "success"%}
<strong>Finished.</strong>
- <a href="{{ settings.BUILDS_URL }}/{{ build.ident }}/{{ build.filename }}">Download</a>
+ <a href="{{ build.result_url}}">Download</a>
{% endif %}
</td>
--
live-studio
More information about the debian-live-changes
mailing list