extras-buildsys/server UserInterface.py,1.26,1.27

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	UserInterface.py 
Log Message:
2005-07-22  Dan Williams <dcbw at redhat.com>

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- UserInterface.py	22 Jul 2005 21:35:27 -0000	1.26
+++ UserInterface.py	23 Jul 2005 00:55:26 -0000	1.27
@@ -314,17 +314,15 @@
         jobrec['starttime'] = job[5]
         jobrec['endtime'] = job[6]
         jobrec['status'] = job[7]
-        if job[8]:
+        if job[8] and job[9] and job[10]:
             jobrec['epoch'] = job[8]
-        if job[9]:
             jobrec['version'] = job[9]
-        if job[10]:
             jobrec['release'] = job[10]
+            log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release'])
+            if log_url and len(log_url):
+                jobrec['log_url'] = log_url
         if job[12]:        
             jobrec['result_msg'] = job[12]
-        log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release'])
-        if log_url and len(log_url):
-            jobrec['log_url'] = log_url
         jobrec['archjobs'] = []
 
         # Get all archjobs for this job