[Blends-commit] [SCM] website branch, master, updated. c8666b6e91315f4321eb6d3432e159a1ab98678d

[Andreas Tille]

The following commit has been merged in the master branch:
commit c8666b6e91315f4321eb6d3432e159a1ab98678d
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 26 19:38:17 2013 +0200

    Better implementation of severitysummary

diff --git a/webtools/bugs_udd.py b/webtools/bugs_udd.py
index 95c1905..3c75c47 100755
--- a/webtools/bugs_udd.py
+++ b/webtools/bugs_udd.py
@@ -138,8 +138,6 @@ def main():
     VERYGOOD     =  10 # nothing burning
     EXCELLENT    =   5 # There is no real need to look at this meta package
 
-    severitysummary = {} # Number of bugs in different severity / dependency classes
-
     # initialise bugs_data dictionary for all tasks
     _execute_udd_query( "EXECUTE query_get_tasks('%s')" % blendname)
     bugs_data = {}
@@ -154,10 +152,10 @@ def main():
                 bugs_data[task][status + '_l']  = [] # enable sorting
                 bugs_data[task][status]         = {}
                 if status != 'done':
+                    bugs_data[task][status]['severitysummary'] = '' # string listing number of bugs in different severity / dependency classes
                     bugs_data[task][status]['severities'] = {}
                     for s in SEVERITIES:
                         bugs_data[task][status]['severities'][s] = 0
-            severitysummary[task] = {}
     else:
         print >>stderr, "No tasks metadata received for Blend", blendname
         exit(1)
@@ -382,13 +380,12 @@ the right shows the tasks of %s.""" ) \
     for task in bugs_data:
     	for status in STATES:
             if status != 'done':
-                severitysummary[task][status] = ''
+                bugs_data[task][status]['severitysummary'] = ''
                 komma  = ''
                 for s in SEVERITIES:
     		     if bugs_data[task][status]['severities'][s] != 0:
-    		        severitysummary[task][status] += '%s %i %s' % (komma, bugs_data[task][status]['severities'][s], s)
+    		        bugs_data[task][status]['severitysummary'] += '%s %i %s' % (komma, bugs_data[task][status]['severities'][s], s)
     		        komma = ','
-    	print "DEBUG", task, severitysummary[task]
     	if   wsev < data['assessments'][0][0]:
     		weightedsev[task]   = _('Metapackage is in excellent shape')
     		weightedclass[task] = data['assessments'][0][1]
@@ -446,8 +443,6 @@ the right shows the tasks of %s.""" ) \
     for task in bugs_data:
     	data['task']            = task
     	#data['buglist']         = buglist[task]
-        print "DEBUG: export", task, severitysummary[task]
-        data['severitysummary']  = severitysummary[task]
     	#data['weightedsev']     = weightedsev[task]
     	#data['severitystat']    = severitystat[task]
     
diff --git a/webtools/templates/bugs_udd.xhtml b/webtools/templates/bugs_udd.xhtml
index 4126ff1..f2232af 100644
--- a/webtools/templates/bugs_udd.xhtml
+++ b/webtools/templates/bugs_udd.xhtml
@@ -88,12 +88,13 @@
       <span py:choose="">
 	<span py:when="bugs_data[task][status] != {}">
 	  <h2>${headings[category[status]]}</h2>
-            <div class="severitylist" py:if="severitysummary[status] != ''">
-                ${severitysummary[status]}
+            <div class="severitylist" py:if="bugs_data[task][status]['severitysummary'] != ''">
+                ${bugs_data[task][status]['severitysummary']}
 	    </div>
-	  <table class="${cssclass[cat]}">
-	    <py:for each="pkgbug in buglist[cat].pkgbugs">
-	      <span py:if="pkgbug.nbugs > 0">
+<!--
+	  <table class="${cssclass[category[status]]}">
+	    <py:for each="pkgbug in bugs_data[task][status]">
+	      <span py:if="pkgbug[nopenbugs] > 0">
 		<tr>
 		  <td class="bugid" colspan="3">
 		    <div class="bugsheadertable">
@@ -125,6 +126,7 @@
 	      </span>
 	    </py:for>
 	  </table>
+-->
 	</span>
 	<span py:otherwise=""><h2>${nobugs[cat]}</h2></span>
       </span>

-- 
Static and dynamic websites for Debian Pure Blends