[Pkg-debile-commits] [debile-web] 02/02: Cope with non-existing build-jobs

[Jon Severinsson]

This is an automated email from the git hooks/post-receive script.

jonno-guest pushed a commit to branch master
in repository debile-web.

commit a2b8262943db43e1e613c6db5a3c3470953cb2d9
Author: Jon Severinsson <jon at severinsson.net>
Date:   Fri Mar 28 19:03:44 2014 +0100

    Cope with non-existing build-jobs
---
 debileweb/blueprints/frontend.py | 2 +-
 templates/job.html               | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index add7cba..7e1e51d 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -552,7 +552,7 @@ def job(job_id, group_name="", package_name="", package_version="", version=""):
     info['source_link'] = '/source/%s/%s/%s' % \
         (job.group.name, job.source.name, job.source.version)
     info['binary_link'] = '/job/%s/%s/%s/%d' % \
-        (job.group.name, job.binary.name, job.binary.version, job.binary.build_job_id) if job.binary else None
+        (job.group.name, job.binary.name, job.binary.version, job.binary.build_job_id) if (job.binary and job.binary.build_job_id) else None
     info['builder_link'] = "/builder/%s" % job.builder.name
 
     info['dud_name'] = "%d.dud" % job.id
diff --git a/templates/job.html b/templates/job.html
index 96d7f30..72e6ee7 100644
--- a/templates/job.html
+++ b/templates/job.html
@@ -13,7 +13,13 @@
         {% if job.binary %}
             <div class='desc_line'>
                 <div class='desc_key'>Binary</div>
-                <div class='desc_value'><a href='{{info.binary_link}}'>{{job.binary.name}}/{{job.binary.version}}</a></div>
+                <div class='desc_value'>
+                    {% if info.binary_link %}
+                        <a href='{{info.binary_link}}'>{{job.binary.name}}/{{job.binary.version}}</a>
+                    {% else %}
+                        {{job.binary.name}}/{{job.binary.version}}
+                    {% endif %}
+                </div>
             </div>
         {% endif %}
         <div class='desc_line'>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git