openerp-dev-web team mailing list archive

["tfr \(Openerp\)" <tfr@xxxxxxxxxxx>]

tfr (Openerp) has proposed merging lp:~openerp-dev/openobject-client/group_by_header into lp:openobject-client.

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

-- 
https://code.launchpad.net/~openerp-dev/openobject-client/group_by_header/+merge/41314
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/group_by_header.

=== modified file 'bin/widget/view/list.py'
--- bin/widget/view/list.py	2010-11-03 12:32:45 +0000
+++ bin/widget/view/list.py	2010-11-19 14:31:53 +0000
@@ -35,19 +35,24 @@
 from widget.model.record import ModelRecord
 
 class field_record(object):
-    def __init__(self, name):
+    def __init__(self, name, count):
         self.name = name
+        if count:
+            count = ' (' + count +')'
+        self.count = count
 
     def get_client(self, *args):
         if isinstance(self.name, (list,tuple)):
-            return self.name[1]
+            return self.name[1] + self.count
+        if self.count:
+            return str(self.name) + self.count
         return self.name
 
     def get(self, *args):
         if isinstance(self.name, (list,tuple)):
             return self.name[0]
         return self.name
-
+    
     def get_state_attrs(self, *args, **argv):
         return {}
 
@@ -90,7 +95,8 @@
         pass
 
     def __getitem__(self, attr):
-        return field_record(self.value.get(attr, ''))
+        count = str(self.value.get('%s_count' % attr,''))
+        return field_record(self.value.get(attr, ''), count)
 
 def echo(fn):
     def wrapped(self, *v, **k):

=== modified file 'bin/widget/view/tree_gtk/parser.py'
--- bin/widget/view/tree_gtk/parser.py	2010-10-26 13:12:15 +0000
+++ bin/widget/view/tree_gtk/parser.py	2010-11-19 14:31:53 +0000
@@ -582,7 +582,10 @@
 
     def get_textual_value(self, model):
         selection = dict(self.attrs['selection'])
-        return selection.get(model[self.field_name].get(model), '')
+        selection_value = selection.get(model[self.field_name].get(model), '')
+        if isinstance(model, group_record):
+            return selection_value +  model[self.field_name].count
+        return selection_value
 
     def value_from_text(self, model, text):
         selection = self.attrs['selection']