← Back to branch summary

~openerp-dev/openobject-client/trunk-dev-client_merge_rev1222

« back to all changes in this revision

Viewing changes to bin/widget_search/form.py

  • Committer: Stephane Wirtel
  • Date: 2010-04-01 11:59:28 UTC
  • mfrom: (1202.1.20 trunk-dev-client)
  • Revision ID: stephane@openerp.com-20100401115928-n7usfuaypq97173h
[MERGE] lp:~openerp-dev/openobject-client/trunk-dev-client 

revno: 1222
revision-id: nch@tinyerp.com-20100401071511-btkyuld52qd3004h
parent: nch@tinyerp.com-20100401065749-ukknmty6qrdunjqw
committer: nch@tinyerp.com
branch nick: trunk-dev-client
timestamp: Thu 2010-04-01 12:45:11 +0530
message:
  [IMP,REF]:Columns move in multilevel group by

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/widget_search/form.py
313
313
        ww, hw = 640,800
314
314
        if self.parent:
315
315
            ww, hw = self.parent.size_request()
316
 
 
 
316
        self.groupby = []
317
317
        self.widget, self.widgets = parser.parse_filter(xml_arch, ww, dom.firstChild, call=call)
318
318
        self.rows = 4
319
319
        self.focusable = parser.focusable
377
377
    def _value_get(self):
378
378
        domain = []
379
379
        context = {}
 
380
 
380
381
        for x in self.widgets.values() + self.custom_widgets.values():
381
382
            domain += x[0].value.get('domain',[])
382
 
            context.update( x[0].value.get('context',{}) )
383
 
 
 
383
            ctx = x[0].value.get('context',{})
 
384
            if ctx.get('group_by', False):
 
385
                if not ctx['group_by'] in self.groupby:
 
386
                    self.groupby.append(ctx['group_by'])
 
387
            elif ctx.get('remove_group',False):
 
388
                if ctx['remove_group'] in self.groupby:
 
389
                    self.groupby.remove(ctx['remove_group'])
 
390
            else:
 
391
                context.update(ctx)
 
392
        if self.groupby:
 
393
            context.update({'group_by':self.groupby})
384
394
        if domain:
385
395
            if len(domain)>1 and domain[-2] in ['&','|']:
386
396
                if len(domain) == 2: