[Pkg-debile-commits] [debile-web] 01/01: Update for new debile.git
Jon Severinsson
jonno-guest at moszumanska.debian.org
Sun May 4 16:38:25 UTC 2014
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 7444052417ad9b346f58e46f5747629736c7c6fd
Author: Jon Severinsson <jon at severinsson.net>
Date: Thu May 1 16:45:24 2014 +0200
Update for new debile.git
---
debileweb/blueprints/frontend.py | 17 +++++++++--------
templates/job.html | 32 +++++++++++++++-----------------
templates/job_list_fragment.html | 4 ++--
templates/source.html | 4 ++++
templates/source_list_fragment.html | 4 ++--
5 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index c387ead..4225ab7 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -98,7 +98,7 @@ def index():
info['queued_sources'] = session.query(Source).filter(
Source.jobs.any(
~Job.depedencies.any() &
- (Job.externally_blocked == False) &
+ (Job.dose_report == None) &
(Job.assigned_at == None) &
(Job.finished_at == None) &
Job.failed.is_(None)
@@ -107,7 +107,7 @@ def index():
info['unbuilt_sources'] = session.query(Source).filter(
Source.jobs.any(
Job.check.has(Check.build == True) &
- (Job.built_binary == None)
+ ~Job.built_binaries.any()
),
).count()
info['failed_sources'] = session.query(Source).filter(
@@ -119,14 +119,14 @@ def index():
).count()
info['queued_jobs'] = session.query(Job).filter(
~Job.depedencies.any(),
- Job.externally_blocked == False,
+ Job.dose_report == None,
Job.assigned_at == None,
Job.finished_at == None,
Job.failed.is_(None),
).count()
info['unbuilt_jobs'] = session.query(Job).filter(
Job.check.has(Check.build == True),
- Job.built_binary == None,
+ ~Job.built_binaries.any(),
).count()
info['failed_jobs'] = session.query(Job).filter(
Job.failed.is_(True),
@@ -196,7 +196,7 @@ def sources(search="", prefix="recent", page=0):
query = session.query(Source).filter(
Source.jobs.any(
~Job.depedencies.any() &
- (Job.externally_blocked == False) &
+ (Job.dose_report == None) &
(Job.assigned_at == None) &
(Job.finished_at == None) &
Job.failed.is_(None)
@@ -210,7 +210,7 @@ def sources(search="", prefix="recent", page=0):
query = session.query(Source).filter(
Source.jobs.any(
Job.check.has(Check.build == True) &
- (Job.built_binary == None)
+ ~Job.built_binaries.any()
),
).order_by(
Source.name.asc(),
@@ -293,12 +293,13 @@ def jobs(prefix="recent", page=0):
elif prefix == "queued":
desc = "All jobs in the queue."
query = session.query(Job).join(Job.source).join(Job.check).filter(
- Job.externally_blocked == False,
+ Job.dose_report == None,
~Job.depedencies.any(),
Job.assigned_at == None,
Job.finished_at == None,
Job.failed.is_(None),
).order_by(
+ Job.assigned_count.asc(),
Check.build.desc(),
Source.uploaded_at.asc(),
)
@@ -306,7 +307,7 @@ def jobs(prefix="recent", page=0):
desc = "All unbuilt build jobs."
query = session.query(Job).join(Job.source).filter(
Job.check.has(Check.build == True),
- Job.built_binary == None,
+ ~Job.built_binaries.any(),
).order_by(
Source.name.asc(),
Source.uploaded_at.desc(),
diff --git a/templates/job.html b/templates/job.html
index 8c66870..95eae9a 100644
--- a/templates/job.html
+++ b/templates/job.html
@@ -50,10 +50,6 @@
<div class='desc_key'>Architecture</div>
<div class='desc_value'>{{job.arch.name}}</div>
</div>
- <div class='desc_line'>
- <div class='desc_key'>Arch affinity</div>
- <div class='desc_value'>{{job.affinity.name}}</div>
- </div>
{% if job.builder %}
<div class='desc_line'>
<div class='desc_key'>Builder</div>
@@ -105,7 +101,7 @@
{% endif %}
{% elif job.assigned_at %}
⧖ Building
- {% elif job.externally_blocked or job.depedencies %}
+ {% elif job.dose_report or job.depedencies %}
∞ Dep-Wait
{% else %}
⌚ Needs-Build
@@ -146,21 +142,23 @@
</div>
{% endfor %}
- {% if job.built_binary %}
+ {% if job.built_binaries %}
<div class='block'>
<h3>Binary packages</h3>
- <div class='desc_line'>
- <div class='desc_key'>Uploaded</div>
- <div class='desc_value'>{{job.built_binary.uploaded_at|ago}}</div>
- </div>
- <div class='desc_line'>
- <div class='desc_key'>Binary packages</div>
- <div class='desc_value'>
- {% for deb in job.built_binary.debs %}
- <a href='{{deb.url}}'>{{deb.filename}}</a><br />
- {% endfor %}
+ {% for binary in job.built_binaries %}
+ <div class='desc_line'>
+ <div class='desc_key'>Uploaded</div>
+ <div class='desc_value'>{{binary.uploaded_at|ago}}</div>
</div>
- </div>
+ <div class='desc_line'>
+ <div class='desc_key'>Binary packages</div>
+ <div class='desc_value'>
+ {% for deb in jbinary.debs %}
+ <a href='{{deb.url}}'>{{deb.filename}}</a><br />
+ {% endfor %}
+ </div>
+ </div>
+ {% endfor %}
</div>
{% endif %}
diff --git a/templates/job_list_fragment.html b/templates/job_list_fragment.html
index 5917a4f..2d4008b 100644
--- a/templates/job_list_fragment.html
+++ b/templates/job_list_fragment.html
@@ -45,7 +45,7 @@
⧖ Upload Pending
{% elif info.job.failed %}
✗ Failed
- {% elif not info.job.built_binary %}
+ {% elif not info.job.built_binaries %}
⧖ Upload Pending
{% else %}
✓ Uploaded
@@ -62,7 +62,7 @@
{% endif %}
{% elif info.job.assigned_at %}
⧖ Building
- {% elif info.job.externally_blocked or info.job.depedencies %}
+ {% elif info.job.dose_report or info.job.depedencies %}
∞ Dep-Wait
{% else %}
⌚ Needs-Build
diff --git a/templates/source.html b/templates/source.html
index c7d5c05..edf1246 100644
--- a/templates/source.html
+++ b/templates/source.html
@@ -48,6 +48,10 @@
</div>
</div>
<div class='desc_line'>
+ <div class='desc_key'>Arch affinity</div>
+ <div class='desc_value'>{{source.affinity.name}}</div>
+ </div>
+ <div class='desc_line'>
<div class='desc_key'>Uploader</div>
<div class='desc_value'><a href='{{info.uploader_link}}'>{{source.uploader.name}}</a></div>
</div>
diff --git a/templates/source_list_fragment.html b/templates/source_list_fragment.html
index 264679c..90b1353 100644
--- a/templates/source_list_fragment.html
+++ b/templates/source_list_fragment.html
@@ -34,14 +34,14 @@
⧖
{% elif job.failed %}
✗
- {% elif job.check.build and not job.built_binary %}
+ {% elif job.check.build and not info.job.built_binaries %}
⧖
{% else %}
✓
{% endif %}
{% elif job.assigned_at %}
⧖
- {% elif job.externally_blocked or job.depedencies %}
+ {% elif job.dose_report or job.depedencies %}
∞
{% else %}
⌚
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git
More information about the Pkg-debile-commits
mailing list