Merge lp:~bryce/gtg/lp-602108 into lp:~gtg/gtg/old-trunk

[Bryce Harrington]

I've attached a branch with a change to the filter code that seems to fix it (at least for the test case in the description).

It seems that in __is_displayed(), if there is a tag filter using a tag that is not defined, it skips processing of it (which is correct) but the logic falls through to returning a True result by default. This branch changes this particular error case to default as False.

I am not 100% certain that this is the proper way to fix the bug, thus am proposing a merge for lionel to review rather than push it right into the tree. Meanwhile, I'll run this branch on my local tree and look for issues.

[Bryce Harrington (bryce)]

I also fixed some of the surrounding comments grammar and spelling, sorry for that noise.

[Luca Invernizzi (invernizzi)]

This one probably needs to be ported to liblarch.

=== modified file 'GTG/core/filteredtree.py'
--- GTG/core/filteredtree.py	2010-06-22 07:30:45 +0000
+++ GTG/core/filteredtree.py	2010-07-06 03:22:22 +0000
@@ -496,7 +496,7 @@
     
     def is_displayed(self,tid):
         """
-        This is a public method that return True if the task is
+        This is a public method that returns True if the task is
         currently displayed in the tree
         """
         if tid:
@@ -507,7 +507,7 @@
     
     def __is_displayed(self, tid):
         """
-        This is a private method that return True if the task *should*
+        This is a private method that returns True if the task *should*
         be displayed in the tree, regardless of its current status
         """
         if tid:
@@ -522,11 +522,14 @@
                     result = result and temp
                     if not filt.get_parameters('ignore_when_counting'):
                         counting_result = counting_result and temp
+                else:
+                    # Filter undefined (maybe it's a non-existant tag?)
+                    result = False
             if counting_result and tid not in self.counted_nodes:
-                #This is an hard custom optimisation for task counting
+                #This is a hard custom optimisation for task counting.
                 #Normally, we would here reset the cache of counted tasks
-                #But this slow down a lot the startup.
-                #So, we update manually the cache.
+                #But this slows down the startup a lot.
+                #So, we update the cache manually.
                 for k in self.count_cache.keys():
                     f = self.req.get_filter(k)
                     if f.is_displayed(tid):

=== modified file 'gtcli'
--- gtcli	2010-07-03 05:46:35 +0000
+++ gtcli	2010-07-06 03:22:22 +0000
@@ -126,7 +126,10 @@
 
     for task in tasks:
         task['startdate'] = startdate
-        print task['id']
+        tags = []
+        for tag in list(task['tags']):
+            tags.append(str(tag))
+        print "%-12s %-20s %s" %(task['id'], ", ".join(tags), task['title'])
         timi.modify_task(task['id'], task)
 
 def open_task_editor(tid):