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

[Andreas Tille]

The following commit has been merged in the master branch:
commit 7edbd44b2337322ad976f0094bd715b7b63d3a20
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 26 18:13:41 2013 +0200

    Fix when condition in main table

diff --git a/webtools/bugs_udd.py b/webtools/bugs_udd.py
index 4c012b2..0bc5c7d 100755
--- a/webtools/bugs_udd.py
+++ b/webtools/bugs_udd.py
@@ -437,6 +437,7 @@ the right shows the tasks of %s.""" ) \
     data['ndone']           = ndone
     data['weight']          = WEIGHT
     data['severities']      = SEVERITIES
+    data['states']          = STATES
     data['nohomepage']      = _('Homepage not available')
     data['novcsbrowser']    = _('Not maintained in Vcs')
     data['vcslocation']     = _('Vcs')
@@ -449,6 +450,7 @@ the right shows the tasks of %s.""" ) \
     
     for task in bugs_data:
     	data['task']            = task
+	print "DEBUG: export", task, bugs_data[task]['weightedsev']
     	#data['buglist']         = buglist[task]
     	#data['severitysummary'] = severitysummary[task]
     	#data['weightedsev']     = weightedsev[task]
@@ -459,6 +461,7 @@ the right shows the tasks of %s.""" ) \
     	print >> f, template.generate(**data).render('xhtml')
     
     	f.close()
+	print "DEBUG: finished export", task
     
     template = loader.load('bugs_idx_udd.xhtml')
     outputfile = outputdir + '/index.html'
diff --git a/webtools/templates/bugs_udd.xhtml b/webtools/templates/bugs_udd.xhtml
index 0985553..e3bf90f 100644
--- a/webtools/templates/bugs_udd.xhtml
+++ b/webtools/templates/bugs_udd.xhtml
@@ -78,18 +78,18 @@
 	<td class="main">
 		<div class="pageBody">
 
-<h1>Summary bugs page of ${tasks[task].metapkg.PrintedName.capitalize()} meta package</h1>
+<h1>Summary bugs page of task ${task.capitalize()}</h1>
 
-<div class="severitysummary">${weightedsev}<sup>*</sup></div>
+<div class="severitysummary">${bugs_data[task]['weightedsev']}<sup>*</sup></div>
 
 <span py:choose="">
-  <span py:when="nbugs[task]+ndone[task] != 0">
-    <py:for each="cat in buglistcat">
+  <span py:when="bugs_data[task]['nopenbugs']+bugs_data[task]['ndonebugs'] != 0">
+    <py:for each="status in states">
       <span py:choose="">
-	<span py:when="buglist[cat].pkgbugs != []">
-	  <h2>${headings[cat]}</h2>
-            <div class="severitylist" py:if="severitysummary[cat] != ''">
-                ${severitysummary[cat]}
+	<span py:when="bugs_data[task][status] != {}">
+	  <h2>${headings[status]}</h2>
+            <div class="severitylist" py:if="severitysummary[task][status] != ''">
+                ${severitysummary[task][status]}
 	    </div>
 	  <table class="${cssclass[cat]}">
 	    <py:for each="pkgbug in buglist[cat].pkgbugs">
@@ -131,8 +131,7 @@
     </py:for>
    </span>
   <span py:otherwise=""><h2>$projectname
-  ${tasks[task].metapkg.PrintedName.capitalize()} has no known nbugs =
-  ${nbugs[task]}  ndone = ${ndone[task]}</h2></span>
+  ${task.capitalize()} has no known nbugs = ${bugs_data[task]['nopenbugs']} ndone = ${bugs_data[task]['ndonebugs']}</h2></span>
 </span>
 <div class="footnotecontent">
   <sup>*</sup>${weightexplanation}

-- 
Static and dynamic websites for Debian Pure Blends