← Back to team overview

openerp-dev-web team mailing list archive

lp:~openerp-dev/openobject-client/trunk-custom_filter_improvement-nch into lp:openobject-client

 

Naresh(OpenERP) has proposed merging lp:~openerp-dev/openobject-client/trunk-custom_filter_improvement-nch into lp:openobject-client.

Requested reviews:
  OpenERP sa GTK client R&D (openerp-dev-gtk)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-custom_filter_improvement-nch/+merge/56296
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-custom_filter_improvement-nch/+merge/56296
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/trunk-custom_filter_improvement-nch.
=== modified file 'bin/widget/view/screen_container.py'
--- bin/widget/view/screen_container.py	2011-04-04 10:49:12 +0000
+++ bin/widget/view/screen_container.py	2011-04-05 07:07:27 +0000
@@ -101,8 +101,14 @@
         return str(self.domain),str(self.context)
 
     def add_custom_filter(self, button, screen):
+        fields_to_add = {}
         fields = screen.search_view.get('fields', {})
-        panel = screen.filter_widget.add_custom(screen.filter_widget, screen.filter_widget.widget, fields)
+        supported_types = ['many2one','text','char','float','integer','date',\
+                           'datetime','selection','many2many','boolean','one2many']
+        for string, attr in fields.iteritems():
+            if attr['type'] in supported_types and attr.get('selectable', False):
+                fields_to_add.update({string:attr})
+        panel = screen.filter_widget.add_custom(screen.filter_widget, screen.filter_widget.widget, fields_to_add)
         self.custom_panels.append(panel)
         if len(self.custom_panels)>1:
             self.custom_panels[-1].condition_next.hide()


Follow ups