The following commit has been merged in the master branch:
commit 492f6a496587ce5f353851eae4de5c11d6f34fa3
Author: Andreas Tille <[email protected]>
Date: Thu Aug 1 15:22:10 2013 +0200
Get a somehow working index page
diff --git a/webtools/bugs_udd.py b/webtools/bugs_udd.py
index f0137de..d23bcb8 100755
--- a/webtools/bugs_udd.py
+++ b/webtools/bugs_udd.py
@@ -111,7 +111,7 @@ def main():
# What tasks are involved
query = """PREPARE query_get_tasks (text) AS
- SELECT task FROM blends_tasks WHERE blend = $1 ORDER BY task;
+ SELECT task, description, long_description FROM blends_tasks WHERE blend
= $1 ORDER BY task;
"""
_execute_udd_query(query)
@@ -142,12 +142,14 @@ def main():
_execute_udd_query( "EXECUTE query_get_tasks('%s')" % blendname)
bugs_data = {}
if curs.rowcount > 0:
- for t in curs.fetchall():
- task = t[0]
+ for t in RowDictionaries(curs):
+ task = t['task']
bugs_data[task] = {}
- bugs_data[task]['nopenbugs'] = 0
- bugs_data[task]['ndonebugs'] = 0
- bugs_data[task]['weighttask'] = 0
+ bugs_data[task]['description'] = t['description']
+ bugs_data[task]['long_description'] = t['long_description']
+ bugs_data[task]['nopenbugs'] = 0
+ bugs_data[task]['ndonebugs'] = 0
+ bugs_data[task]['weighttask'] = 0
for status in STATES:
bugs_data[task][status + '_l'] = [] # enable sorting
bugs_data[task][status] = {}
diff --git a/webtools/templates/bugs_idx_udd.xhtml
b/webtools/templates/bugs_idx_udd.xhtml
index d56ce2a..d8fafae 100644
--- a/webtools/templates/bugs_idx_udd.xhtml
+++ b/webtools/templates/bugs_idx_udd.xhtml
@@ -48,15 +48,9 @@
<h1>$gtstrBugsPage</h1>
<p>$gtstrListOfBugspages</p>
<dl>
- <py:for each="task in taskskeys">
- <dt class="${weightedclass[task]}"><a
href="${task}.html" name="${task}"
id="${task}">${tasks[task].metapkg.PrintedName.capitalize()} - <span
py:choose="">
- <span
py:when="tasks[task].metapkg.desc.has_key(lang)">${tasks[task].metapkg.desc[lang]['short']}</span>
- <span
py:otherwise="">${tasks[task].metapkg.desc['en']['short']}</span>
- </span></a> (${weighttask[task]}<sup>*</sup>)</dt>
- <dd><span py:choose="">
- <span
py:when="tasks[task].metapkg.desc.has_key(lang)">${tasks[task].metapkg.desc[lang]['long']}</span>
- <span
py:otherwise="">${tasks[task].metapkg.desc['en']['long']}</span>
- </span></dd>
+ <py:for each="task in bugs_data.keys()">
+ <dt
class="${bugs_data[task]['weightedclass']}"><a href="${task}.html"
name="${task}" id="${task}">${task.capitalize()} -
${bugs_data[task]['description']}</a> (${weighttask[task]}<sup>*</sup>)</dt>
+ <dd>${bugs_data[task]['long_description']}</dd>
</py:for>
</dl>
<div class="footnotecontent">
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
