Changeset 1394

Timestamp:

02/15/11 15:06:59 (15 months ago)

Author:

zeank

Message:

don't remove panel_def header descriptions like submitText when
filtering a panel

refs #270

Files:

• HelpIM3/branches/chatgroups/HelpIM/web/pageBase.py (modified) (2 diffs)

HelpIM3/branches/chatgroups/HelpIM/web/pageBase.py

@@ -121 +121 @@
         filters = self.getFiltersForLocation(self.him_request.resourceName)
         if filters != None:
-            new_panel_def = [self.filterPanel(panel, filters) for panel in panel_defs]
-            return new_panel_def
+            new_panel_defs = [self.filterPanel(panel, filters) for panel in panel_defs]
+            return new_panel_defs
         else:
             return panel_defs
@@ -161 +161 @@
         (type, panel_def) = panel_def.popitem()
 
-        return {
-            'table_panel': lambda panel_def: self.filterFields(type, panel_def[0], filters),
-            'edit_panel' : lambda panel_def: self.filterFields(type, panel_def[1], filters)
-            }[type](panel_def)
-        
-    def filterFields(self, type, columns, filters):
-        return {type: [filter(
-            lambda column: self.filterPanelField(column, filters),
-            columns
+        if len(panel_def) == 2:
+            header = panel_def[0]
+            defs = panel_def[1]
+        else:
+            header = {}
+            defs = panel_def[0]
+            
+        return self.filterFields(type, header, defs, filters)
+        
+    def filterFields(self, type, header, defs, filters):
+        return {type: [header, filter(
+            lambda fdef: self.filterPanelField(fdef, filters),
+            defs
             )]}
 
-    def filterPanelField(self, column, filters):
+    def filterPanelField(self, fdef, filters):
         searchkey = ''
-        field_def = column.values()[0]
+        field_def = fdef.values()[0]
         
         if field_def[0] and field_def[0].has_key('id'):