← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-client/6.0-bug-743890-xrg into lp:openobject-client/6.0

 

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

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #743890 in OpenERP Server: "overwriting read method breaks group by and sort "
  https://bugs.launchpad.net/openobject-server/+bug/743890

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/6.0-bug-743890-xrg/+merge/55563
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/6.0-bug-743890-xrg/+merge/55563
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/6.0-bug-743890-xrg.
=== modified file 'bin/widget/view/list.py'
--- bin/widget/view/list.py	2011-01-17 20:28:40 +0000
+++ bin/widget/view/list.py	2011-03-30 15:01:04 +0000
@@ -310,12 +310,13 @@
             return None
 
     def on_iter_has_child(self, node):
-        res = getattr(node,'has_children', False)
-        return res
+        if not getattr(node,'has_children', False):
+            return False
+        return len(node.children) > 0
 
     def on_iter_children(self, node):
         res = getattr(node, 'children', [])
-        return res and res[0] or []
+        return res and res[0] or None
 
     def on_iter_n_children(self, node):
         return len(getattr(node, 'children', []))