openerp-dev-web team mailing list archive

[xrg <xrg@xxxxxxxxx>]

xrg has proposed merging lp:~openerp-dev/openobject-client/6.0-bug-746071-xrg into lp:openobject-client/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #746071 in OpenERP Server: "Additional filter "Company" not working in SPANISH"
  https://bugs.launchpad.net/openobject-server/+bug/746071

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/6.0-bug-746071-xrg/+merge/56105
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/6.0-bug-746071-xrg/+merge/56105
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/6.0-bug-746071-xrg.

=== modified file 'bin/widget_search/custom_filter.py'
--- bin/widget_search/custom_filter.py	2011-01-25 10:58:55 +0000
+++ bin/widget_search/custom_filter.py	2011-04-04 06:53:23 +0000
@@ -51,7 +51,7 @@
 
         # Processing operator combo
         self.combo_op = win_gl.get_widget('combo_operator')
-        self.op_selection = {}
+        self.op_active = []
 
         for item in (['ilike', _('contains')],
                 ['not ilike', _('doesn\'t contain')],
@@ -62,8 +62,8 @@
                 ['in',_('in')],
                 ['not in',_('not in')],
                 ):
-            self.op_selection[item[1]] = item[0]
             self.combo_op.append_text(item[1])
+            self.op_active.append(item[0])
 
         self.combo_op.set_active(0)
 
@@ -96,7 +96,7 @@
                         }
             field_left = self.field_selection[self.combo_fields.get_active_text()][0]
             field_type = self.field_selection[self.combo_fields.get_active_text()][1]
-            operator = self.op_selection[self.combo_op.get_active_text()]
+            operator = self.op_active[self.combo_op.get_active()]
             right_text =  self.right_text.get_text() or False
 
             if operator in ['not ilike','<>', 'not in'] and field_type != 'boolean':