[Pkg-debile-commits] [debile-web] 01/01: Misc fixes

[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 d5793537ae64997854fb648497f98f25381bb4a4
Author: Jon Severinsson <jon at severinsson.net>
Date:   Sun Mar 30 22:28:17 2014 +0200

    Misc fixes
---
 debileweb/blueprints/frontend.py    | 32 ++++++++------------------------
 templates/job.html                  |  4 ++--
 templates/job_list_fragment.html    |  4 ++--
 templates/source_list_fragment.html |  2 +-
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index 8466ff4..f0bc229 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -273,80 +273,66 @@ def jobs(prefix="recent", page=0):
 
     if prefix == "recent":
         desc = "All recently uploaded jobs."
-        query = session.query(Source).join(Job.source).join(Job.check).order_by(
+        query = session.query(Job).join(Job.source).order_by(
             Source.uploaded_at.desc(),
-            Check.build.desc(),
-            Check.id.asc(),
             Job.id.asc(),
         )
     elif prefix == "unfinished":
         desc = "All unfinished jobs."
-        query = session.query(Job).join(Job.source).join(Job.check).filter(
+        query = session.query(Job).join(Job.source).filter(
             Job.finished_at == None,
         ).order_by(
             Source.name.asc(),
             Source.uploaded_at.desc(),
-            Check.build.desc(),
-            Check.id.asc(),
             Job.id.asc(),
         )
     elif prefix == "queued":
         desc = "All jobs in the queue."
-        query = session.query(Job).join(Job.source).join(Job.check).filter(
+        query = session.query(Job).join(Job.source).filter(
             Job.externally_blocked == False,
             ~Job.depedencies.any(),
             Job.assigned_at == None,
         ).order_by(
             Source.name.asc(),
             Source.uploaded_at.desc(),
-            Check.build.desc(),
-            Check.id.asc(),
             Job.id.asc(),
         )
     elif prefix == "unbuilt":
         desc = "All unbuild build jobs."
-        query = session.query(Job).join(Job.source).join(Job.check).filter(
+        query = session.query(Job).join(Job.source).filter(
             Job.check.has(Check.build == True),
             Job.finished_at == None,
         ).order_by(
             Source.name.asc(),
             Source.uploaded_at.desc(),
-            Check.build.desc(),
-            Check.id.asc(),
             Job.id.asc(),
         )
     elif prefix == "failed":
         desc = "All failed jobs."
-        query = session.query(Job).join(Job.source).join(Job.check).filter(
+        query = session.query(Job).join(Job.source).filter(
             Job.failed == True,
         ).order_by(
             Source.name.asc(),
             Source.uploaded_at.desc(),
-            Check.build.desc(),
-            Check.id.asc(),
             Job.id.asc(),
         )
     elif prefix == "l":
         desc = "All jobs for packages beginning with 'l'"
-        query = session.query(Job).join(Job.source).join(Job.check).filter(
+        query = session.query(Job).join(Job.source).filter(
             Source.name.startswith("l"),
             ~Source.name.startswith("lib"),
         ).order_by(
             Source.name.asc(),
             Source.uploaded_at.desc(),
-            Check.build.desc(),
-            Check.id.asc(),
             Job.id.asc(),
         )
     else:
         desc = "All jobs for packages beginning with '%s'" % prefix
-        query = session.query(Job).join(Job.source).join(Job.check).filter(
+        query = session.query(Job).join(Job.source).filter(
             Source.name.startswith(prefix),
         ).order_by(
             Source.name.asc(),
             Source.uploaded_at.desc(),
-            Check.build.desc(),
-            Check.id.asc(),
             Job.id.asc(),
         )
 
@@ -587,11 +573,9 @@ def source(group_name, package_name, suite_or_version):
                 (group_name, package_name, version)
             versions_info.append((version, href))
 
-    jobs = session.query(Job).join(Job.check).filter(
+    jobs = session.query(Job).filter(
         Job.source == source,
     ).order_by(
-        Check.build.desc(),
-        Check.id.asc(),
         Job.id.asc(),
     ).all()
 
diff --git a/templates/job.html b/templates/job.html
index 5253f46..2eda59e 100644
--- a/templates/job.html
+++ b/templates/job.html
@@ -68,7 +68,7 @@
                 {% if job.finished_at %}
                     {% if job.check.build %}
                         {# Builds #}
-                        {% if job.failed is None %}
+                        {% if job.failed == None %}
                             ⧖ Upload Pending
                         {% elif job.failed %}
                             ✗ Failed
@@ -77,7 +77,7 @@
                         {% endif %}
                     {% else %}
                         {# Analyzers #}
-                        {% if job.failed is None %}
+                        {% if job.failed == None %}
                             ⧖ Upload Pending
                         {% elif job.failed %}
                             ✗ Errors found
diff --git a/templates/job_list_fragment.html b/templates/job_list_fragment.html
index fda44af..26838cd 100644
--- a/templates/job_list_fragment.html
+++ b/templates/job_list_fragment.html
@@ -41,7 +41,7 @@
                 {% if info.job.finished_at %}
                     {% if info.job.check.build %}
                         {# Builds #}
-                        {% if info.job.failed is None %}
+                        {% if info.job.failed == None %}
                             ⧖ Upload Pending
                         {% elif info.job.failed %}
                             ✗ Failed
@@ -50,7 +50,7 @@
                         {% endif %}
                     {% else %}
                         {# Analyzers #}
-                        {% if info.job.failed is None %}
+                        {% if info.job.failed == None %}
                             ⧖ Upload Pending
                         {% elif info.job.failed %}
                             ✗ Errors found
diff --git a/templates/source_list_fragment.html b/templates/source_list_fragment.html
index 4a08b7f..0abe0c7 100644
--- a/templates/source_list_fragment.html
+++ b/templates/source_list_fragment.html
@@ -30,7 +30,7 @@
             <td>
                 {% for job in info.source.jobs %}
                     {% if job.finished_at %}
-                        {% if job.failed is None %}
+                        {% if job.failed == None %}
                             ⧖
                         {% elif job.failed %}
                             ✗

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