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

[Andreas Tille]

The following commit has been merged in the master branch:
commit 9649b19c7dd704f2f58abe7b270802e409a997a9
Author: Andreas Tille <tille at debian.org>
Date:   Thu Aug 1 16:18:50 2013 +0200

    Fix template to render also single bugs ... except when there are encoding problems, which is SOOOOOO boring :-(

diff --git a/webtools/templates/bugs_udd.xhtml b/webtools/templates/bugs_udd.xhtml
index f225336..5383e93 100644
--- a/webtools/templates/bugs_udd.xhtml
+++ b/webtools/templates/bugs_udd.xhtml
@@ -91,42 +91,40 @@
             <div class="severitylist" py:if="status != 'done' and bugs_data[task][status]['severitysummary'] != ''">
                 ${bugs_data[task][status]['severitysummary']}
 	    </div>
-<!--
 	  <table class="${cssclass[category[status]]}">
-	    <py:for each="pkgbug in bugs_data[task][status]">
-	      <span py:if="pkgbug[nopenbugs] > 0">
+	    <py:for each="pkgbug in bugs_data[task][status]['sources']">
+<!--	      <span py:if="pkgbug['sources'] != []">  -->
 		<tr>
 		  <td class="bugid" colspan="3">
 		    <div class="bugsheadertable">
 		      <div class="bugsheadertr">
-			<span class="bugsheaderpackagetd" id="bugsheaderpackagetd"><a href="http://packages.qa.debian.org/${pkgbug.source[0]}/${pkgbug.source}.html">${pkgbug.pkgname}</a> (${pkgbug.nbugs})</span>
-                        <span class="bugsheaderhomepagetd" id="bugsheaderhomepagetd" py:choose="pkgbug.homepage">
+			<span class="bugsheaderpackagetd" id="bugsheaderpackagetd"><a href="http://packages.qa.debian.org/${pkgbug['source'][0]}/${pkgbug['source']}.html">${pkgbug['source']}</a> (${len(pkgbug['bugs'])})</span>
+                        <span class="bugsheaderhomepagetd" id="bugsheaderhomepagetd" py:choose="pkgbug['homepage']">
                           <span py:when="'#'">${nohomepage}</span>
-                          <span py:otherwise=""><a href="$pkgbug.homepage">Homepage: ${pkgbug.homepage}</a></span>
+                          <span py:otherwise=""><a href="$pkgbug['homepage']">Homepage: ${pkgbug['homepage']}</a></span>
 			</span>
-                        <span class="bugvcsbrowser" id="bugvcsbrowser" py:choose="pkgbug.vcsbrowser">
+                        <span class="bugvcsbrowser" id="bugvcsbrowser" py:choose="pkgbug['vcs_browser']">
                           <span py:when="'#'">${novcsbrowser}</span>
-                          <span py:otherwise=""><a href="$pkgbug.vcsbrowser">${vcslocation}</a></span>
+                          <span py:otherwise=""><a href="$pkgbug['vcs_browser']">${vcslocation}</a></span>
 			</span>
                         <span class="bugsmaintainer" id="bugsmaintainer" py:choose="">
-                          <span py:when="pkgbug.maintainer != None">${pkgbug.maintainer}</span>
+                          <span py:when="pkgbug.has_key('maintainer')">${pkgbug['maintainer']}</span>
                           <span py:otherwise="">unknown maintainer</span>
 			</span>
 		      </div>
                     </div>
 		  </td>
 		</tr>
-		<py:for each="bug in pkgbug.bugs">
+		<py:for each="bug in pkgbug['bugs']">
 		  <tr>
-		    <td class="bugid ${bug.severity}"><a href="http://bugs.debian.org/${bug.bug}">${bug.bug}</a></td>
-		    <td class="summary ${bug.severity}">${bug.summary}</td>
-		    <td class="severity ${bug.severity}">${bug.tags}</td>
+		    <td class="bugid ${bug['severity']}"><a href="http://bugs.debian.org/${bug['id']}">${bug['id']}</a></td>
+		    <td class="summary ${bug['severity']}">${bug['title']}</td>
+		    <td class="severity ${bug['severity']}">${bug['tags']}</td>
 		  </tr>
 		</py:for>
-	      </span>
+<!--	      </span> -->
 	    </py:for>
 	  </table>
--->
 	</span>
 	<span py:otherwise=""><h2>${nobugs[cat]}</h2></span>
       </span>

-- 
Static and dynamic websites for Debian Pure Blends