changeset 354:8b431b302c79

CollectLists: simplified exclusion of filter_selection by transpose
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Thu, 05 Feb 2009 10:58:08 +0100
parents 51772c48c3eb
children 5be8fa5a1ff6
files data/plugin/macro/CollectLists.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/macro/CollectLists.py	Thu Feb 05 08:38:49 2009 +0100
+++ b/data/plugin/macro/CollectLists.py	Thu Feb 05 10:58:08 2009 +0100
@@ -47,7 +47,7 @@
 
     if not pagename:
         pagename = formatter.page.page_name
-        
+
     if filter_column_value and ':: ' in filter_column_value:
         filter_key, filter_word = filter_column_value.split('::')
         filter_key = filter_key.strip()
@@ -118,11 +118,12 @@
         data.data = map(None, zip(*data.data))
         data.data = data.data[1:]
     else:
-        if filter_selection and not transpose:
+        # transpose does not support filter_selection
+        if filter_selection:
             filtercols = filter_selection.split(',')
             for key in column_heading_keys:
                 key = key.strip()
-                if key in filtercols:
+                if filter_selection != u'NeverExistingDefaultFilter' and key in filtercols:
                     data.columns.append(Column(key, autofilter=(key in filtercols)))
                 else:
                     data.columns.extend([Column(key, label=key, align=align)])