[Pkg-debile-commits] [debile-web] 01/01: Filter and sort queued jobs list the same way as debile-master

[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 05b2720702b079ec6de081576315be1243b0816b
Author: Jon Severinsson <jon at severinsson.net>
Date:   Sat Apr 19 12:26:53 2014 +0200

    Filter and sort queued jobs list the same way as debile-master
---
 debileweb/blueprints/frontend.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index c45a487..2f7bd0a 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -99,7 +99,8 @@ def index():
         Source.jobs.any(
             ~Job.depedencies.any() &
             (Job.externally_blocked == False) &
-            (Job.assigned_at == None)
+            (Job.assigned_at == None) &
+            (Job.finished_at == None)
         ),
     ).count()
     info['unbuilt_sources'] = session.query(Source).filter(
@@ -119,6 +120,7 @@ def index():
         ~Job.depedencies.any(),
         Job.externally_blocked == False,
         Job.assigned_at == None,
+        Job.finished_at == None,
     ).count()
     info['unbuilt_jobs'] = session.query(Job).filter(
         Job.check.has(Check.build == True),
@@ -193,7 +195,8 @@ def sources(search="", prefix="recent", page=0):
             Source.jobs.any(
                 ~Job.depedencies.any() &
                 (Job.externally_blocked == False) &
-                (Job.assigned_at == None)
+                (Job.assigned_at == None) &
+                (Job.finished_at == None)
             ),
         ).order_by(
             Source.name.asc(),
@@ -286,14 +289,14 @@ def jobs(prefix="recent", page=0):
         )
     elif prefix == "queued":
         desc = "All jobs in the queue."
-        query = session.query(Job).join(Job.source).filter(
+        query = session.query(Job).join(Job.source).join(Job.check).filter(
             Job.externally_blocked == False,
             ~Job.depedencies.any(),
             Job.assigned_at == None,
+            Job.finished_at == None,
         ).order_by(
-            Source.name.asc(),
-            Source.uploaded_at.desc(),
-            Job.id.asc(),
+            Check.build.desc(),
+            Source.uploaded_at.asc(),
         )
     elif prefix == "unbuilt":
         desc = "All unbuilt build jobs."

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