Tristan Hill (credativ) has proposed merging
lp:~stan/openobject-client/int_treestore into lp:openobject-client.
Requested reviews:
OpenERP sa GTK client R&D (openerp-dev-gtk)
Related bugs:
Bug #718080 in OpenERP GTK Client: "TypeError: value is of the wrong type for
this column"
https://bugs.launchpad.net/openobject-client/+bug/718080
For more details, see:
https://code.launchpad.net/~stan/openobject-client/int_treestore/+merge/54121
fix for bug 718080, hopefully now with no conflicts
--
https://code.launchpad.net/~stan/openobject-client/int_treestore/+merge/54121
Your team OpenERP sa GTK client R&D is requested to review the proposed merge
of lp:~stan/openobject-client/int_treestore into lp:openobject-client.
=== modified file 'bin/modules/gui/window/view_tree/view_tree.py'
--- bin/modules/gui/window/view_tree/view_tree.py 2010-12-23 07:16:57 +0000
+++ bin/modules/gui/window/view_tree/view_tree.py 2011-03-20 11:30:55 +0000
@@ -180,7 +180,9 @@
return len(self.fields)+1
def on_get_column_type(self, index):
- if index in self.pixbufs:
+ if index == 0:
+ return int
+ elif index in self.pixbufs:
return gtk.gdk.Pixbuf
return fields_list_type.get(self.fields_type[self.fields[index-1]]['type'],
gobject.TYPE_STRING)
@@ -373,7 +375,7 @@
if not sel:
return []
(model, iters) = sel
- return map(lambda x: int(model.get_value(model.get_iter(x), 0)), iters)
+ return [model.get_value(model.get_iter(x), 0) for x in iters]
def sel_id_get(self):
sel = self.view.get_selection().get_selected()
=== modified file 'bin/modules/gui/window/view_tree/view_tree_sc.py'
--- bin/modules/gui/window/view_tree/view_tree_sc.py 2011-01-10 15:24:02 +0000
+++ bin/modules/gui/window/view_tree/view_tree_sc.py 2011-03-20 11:30:55 +0000
@@ -50,7 +50,7 @@
# self.update()
def update(self):
- store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
+ store = gtk.ListStore(int, str, int)
uid = rpc.session.uid
sc = rpc.session.rpc_exec_auth('/object', 'execute', 'ir.ui.view_sc', 'get_sc', uid, self.model, rpc.session.context) or []
for s in sc:
=== modified file 'bin/widget/view/screen_container.py'
--- bin/widget/view/screen_container.py 2011-01-10 11:59:36 +0000
+++ bin/widget/view/screen_container.py 2011-03-20 11:30:55 +0000
@@ -162,7 +162,7 @@
hb2.pack_start(gtk.Label(''), expand=True, fill=True)
# Limit combo
- self.limit_combo = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+ self.limit_combo = gtk.ListStore(object, str)
self.combo = gtk.ComboBox(self.limit_combo)
cell = gtk.CellRendererText()
self.combo.pack_start(cell, True)
@@ -228,7 +228,7 @@
def get_limit(self):
if hasattr(self,'limit_combo'):
try:
- return int(self.limit_combo.get_value(self.combo.get_active_iter(), 0))
+ return self.limit_combo.get_value(self.combo.get_active_iter(), 0)
except:
return False
else:
=== modified file 'bin/widget/view/tree_gtk/parser.py'
--- bin/widget/view/tree_gtk/parser.py 2011-03-04 12:04:50 +0000
+++ bin/widget/view/tree_gtk/parser.py 2011-03-20 11:30:55 +0000
@@ -609,7 +609,7 @@
def __init__(self, *args):
super(Selection, self).__init__(*args)
self.renderer = gtk.CellRendererCombo()
- selection_data = gtk.ListStore(str, str)
+ selection_data = gtk.ListStore(object, str)
for x in self.attrs.get('selection', []):
selection_data.append(x)
self.renderer.set_property('model', selection_data)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
