extras-buildsys/www failed.psp, 1.2, 1.3 indiv.psp, 1.5, 1.6 success.psp, 1.2, 1.3

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502/www

Modified Files:
	failed.psp indiv.psp success.psp 
Log Message:
2005-08-04  Dan Williams <dcbw at redhat.com>

    * server/UserInterface.py
        - Accept asc/desc ordering in addition to field order.  You now
            do e.x.: args['orderby'] = ['package asc', 'endtime desc']

    * www/indiv.psp
        - Stick in-progress jobs at the top of the list

    * www/template/head.psp
        - Keep user's email address through the success/failed pages




Index: failed.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- failed.psp	4 Aug 2005 20:27:12 -0000	1.2
+++ failed.psp	4 Aug 2005 21:12:47 -0000	1.3
@@ -13,6 +13,7 @@
     # haven't cleared yet.
     args['status'] = ['failed']
     args['result'] = 'failed'
+    args['orderby'] = ['endtime desc']
     args['maxrows'] = 100
     (e, msg, these_jobs) = server.list_jobs(args)
 except socket.error, e:


Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- indiv.psp	4 Aug 2005 20:27:12 -0000	1.5
+++ indiv.psp	4 Aug 2005 21:12:47 -0000	1.6
@@ -32,6 +32,8 @@
         cur_target = str(form['target'])
         if cur_target != 'ALL':
             args['target'] = cur_target
+
+    args['orderby'] = ['endtime desc']
     try:
         (e, msg, jobs) = server.list_jobs(args)
         targets = server.targets()
@@ -121,6 +123,16 @@
 <tbody>
 
 <%
+        # Stick in-progress jobs at the top
+        inprog_jobs = []
+        finished_jobs = []
+        for job in jobs:
+            if job['result'] == 'in-progress':
+                inprog_jobs.append(job)
+            else:
+                finished_jobs.append(job)
+        jobs = inprog_jobs + finished_jobs
+
         i = 1
         for job in jobs:
             # Don't show finished jobs older than 1 day


Index: success.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- success.psp	4 Aug 2005 20:27:12 -0000	1.2
+++ success.psp	4 Aug 2005 21:12:47 -0000	1.3
@@ -10,13 +10,10 @@
 try:
     # show any jobs that have successfully built
     args = {}
-    args['result'] = 'success'
+    args['status'] = ['add_to_repo', 'needsign', 'repodone']
+    args['orderby'] = ['endtime desc']
     args['maxrows'] = 100
-    (e, msg, some_jobs) = server.list_jobs(args)
-    args['status'] = ['add_to_repo']
-    args['maxrows'] = 100
-    (e, msg, other_jobs) = server.list_jobs(args)
-    these_jobs = other_jobs + some_jobs
+    (e, msg, jobs) = server.list_jobs(args)
 except socket.error, e:
     msg = str(e)
 %>
@@ -53,7 +50,7 @@
 
 <%
     i = 1
-    for job in these_jobs:
+    for job in jobs:
         top = ''
         if i == 1:
             top = '-top'