Chirag Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-client-web/6.0-opw-574014-cpa into
lp:openobject-client-web.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-574014-cpa/+merge/104374
Hello,
Fixed issue default_get call twice.
The issue present in the wizards containing a config_logo.
I attached a video link in which I demonstrate the problem in
base_setup/installer.py.
http://www.horsducommun.be/default_get.m4v
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-574014-cpa/+merge/104374
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-client-web/6.0-opw-574014-cpa.
=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py 2012-03-20 12:19:28 +0000
+++ addons/openerp/controllers/form.py 2012-05-02 12:13:21 +0000
@@ -710,11 +710,10 @@
id = kw.get('id')
proxy = rpc.RPCProxy(model)
if id == 'None':
- # FIXME: doesnt honor the context
- res = proxy.default_get([field]).get(field,'')
+ res = kw.get('def_val')
else:
res = proxy.read([int(id)], [field])[0].get(field)
- if res:
+ if res and res != 'None':
return base64.decodestring(res)
else:
return open(openobject.paths.addons('openerp','static','images','placeholder.png'),'rb').read()
=== modified file 'addons/openerp/widgets/form/_binary.py'
--- addons/openerp/widgets/form/_binary.py 2011-10-03 09:17:10 +0000
+++ addons/openerp/widgets/form/_binary.py 2012-05-02 12:13:21 +0000
@@ -92,7 +92,7 @@
self.state = attrs.get('state')
self.field = self.name.split('/')[-1]
if attrs.get('widget'):
- self.src = tools.url('/openerp/form/binary_image_get_image', model=self.model, id=self.id, field=self.field, nocache=random.randint(0,2**32))
+ self.src = tools.url('/openerp/form/binary_image_get_image', model=self.model, id=self.id, field=self.field, nocache=random.randint(0,2**32), def_val=self.value)
self.height = attrs.get('img_height', attrs.get('height', None))
self.width = attrs.get('img_width', attrs.get('width', None))
self.validator = validators.Binary()
_______________________________________________
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
