Merge lp:~unifield-team/unifield-web/uf590_jfb_search_values into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4585
Proposed branch: lp:~unifield-team/unifield-web/uf590_jfb_search_values
Merge into: lp:unifield-web
Diff against target: 40 lines (+13/-3)
1 file modified
addons/openerp/widgets/search.py (+13/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/uf590_jfb_search_values
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+86229@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/openerp/widgets/search.py'
--- addons/openerp/widgets/search.py 2011-05-12 13:55:59 +0000
+++ addons/openerp/widgets/search.py 2011-12-19 13:19:28 +0000
@@ -385,7 +385,7 @@
385385
386 if kind == 'boolean':386 if kind == 'boolean':
387 # '0' in string because 0 is considering as No Value, and we need 0 as some value.387 # '0' in string because 0 is considering as No Value, and we need 0 as some value.
388 field.options = [[1,_('Yes')],['0',_('No')]]388 field.options = [['', ''], [1,_('Yes')],['0',_('No')]]
389 field.validator.if_empty = ''389 field.validator.if_empty = ''
390390
391 default_search = None391 default_search = None
@@ -424,7 +424,7 @@
424 domain = [(name, '>=', defval)]424 domain = [(name, '>=', defval)]
425 425
426 elif field.kind == 'boolean':426 elif field.kind == 'boolean':
427 domain = [(name, '=', defval)]427 domain = [(name, '=', defval!='0')]
428 428
429 else:429 else:
430 domain = [(name,fields[name].get('comparator','ilike'), defval)]430 domain = [(name,fields[name].get('comparator','ilike'), defval)]
@@ -488,7 +488,17 @@
488488
489class Integer(form.Integer): pass489class Integer(form.Integer): pass
490class NewLine(form.NewLine): pass490class NewLine(form.NewLine): pass
491class Selection(form.Selection): pass491class Selection(form.Selection):
492 def __init__(self, **attrs):
493 super(Selection, self).__init__(**attrs)
494 found_empty = False
495
496 for opt in self.options:
497 if not opt[0]:
498 found_empty = True
499
500 if not found_empty:
501 self.options.insert(0, ('',''))
492class Separator(form.Separator): pass502class Separator(form.Separator): pass
493503
494RANGE_WIDGETS = {504RANGE_WIDGETS = {

Subscribers

People subscribed via source and target branches

to all changes: