[Secure-testing-commits] r16134 - bin lib/python

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-02-13 22:46:09 +0000 (Sun, 13 Feb 2011)
New Revision: 16134

Modified:
   bin/tracker_service.py
   lib/python/security_db.py
Log:
display notes on todo page

Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2011-02-13 22:45:52 UTC (rev 16133)
+++ bin/tracker_service.py	2011-02-13 22:46:09 UTC (rev 16134)
@@ -823,11 +823,11 @@
                   'Hide "check" TODOs')
             
         def gen():
-            for (bug, description) in self.db.getTODOs(hide_check=hide_check):
-                yield self.make_xref(url, bug), description
+            for (bug, description, note) in self.db.getTODOs(hide_check=hide_check):
+                yield self.make_xref(url, bug), description, note
         return self.create_page(
-            url, "Bugs with TODO items",
-            [P(flags), make_table(gen(), caption=("Bug", "Description"))])
+            url, 'Bugs with TODO items',
+            [P(flags), make_table(gen(), caption=('Bug', 'Description', 'Note'))])
 
     def page_status_undetermined(self, path, params, url):
         def gen():

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2011-02-13 22:45:52 UTC (rev 16133)
+++ lib/python/security_db.py	2011-02-13 22:46:09 UTC (rev 16134)
@@ -1695,7 +1695,7 @@
             cursor = self.cursor()
         if hide_check:
             return cursor.execute(
-                """SELECT DISTINCT bugs.name, bugs.description
+                """SELECT DISTINCT bugs.name, bugs.description, bugs_notes.comment
                 FROM bugs_notes, bugs
                 WHERE bugs_notes.typ = 'TODO'
                 AND bugs_notes.comment <> 'check'
@@ -1703,7 +1703,7 @@
                 ORDER BY name """)
         else:
             return cursor.execute(
-                """SELECT DISTINCT bugs.name, bugs.description
+                """SELECT DISTINCT bugs.name, bugs.description, bugs_notes.comment
                 FROM bugs_notes, bugs
                 WHERE bugs_notes.typ = 'TODO'
                 AND bugs.name = bugs_notes.bug_name