Merge lp:~camptocamp/openerp-product-attributes/7.0-del-text-workaround-lep into lp:~product-core-editors/openerp-product-attributes/7.0

Proposed by Leonardo Pistone
Status: Merged
Merged at revision: 243
Proposed branch: lp:~camptocamp/openerp-product-attributes/7.0-del-text-workaround-lep
Merge into: lp:~product-core-editors/openerp-product-attributes/7.0
Diff against target: 26 lines (+0/-11)
1 file modified
product_custom_attributes/product.py (+0/-11)
To merge this branch: bzr merge lp:~camptocamp/openerp-product-attributes/7.0-del-text-workaround-lep
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no test Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+217247@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

I see that the workaround is not needed anymore, so I approve the removal.

Regards.

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product_custom_attributes/product.py'
2--- product_custom_attributes/product.py 2014-03-19 17:45:33 +0000
3+++ product_custom_attributes/product.py 2014-04-25 13:59:22 +0000
4@@ -54,16 +54,6 @@
5 relation='attribute.group', string='Groups')
6 }
7
8- def _fix_size_bug(self, cr, uid, result, context=None):
9- #When created a field text dynamicaly, its size is limited to 64 in the view.
10- #The bug is fixed but not merged
11- #https://code.launchpad.net/~openerp-dev/openerp-web/6.1-opw-579462-cpa/+merge/128003
12- #TO remove when the fix will be merged
13- for field in result['fields']:
14- if result['fields'][field]['type'] == 'text':
15- if 'size' in result['fields'][field]: del result['fields'][field]['size']
16- return result
17-
18 def open_attributes(self, cr, uid, ids, context=None):
19 ir_model_data_obj = self.pool.get('ir.model.data')
20 ir_model_data_id = ir_model_data_obj.search(cr, uid, [['model', '=', 'ir.ui.view'], ['name', '=', 'product_attributes_form_view']], context=context)
21@@ -122,5 +112,4 @@
22 )[0]
23 info_page.addnext(main_page)
24 result['arch'] = etree.tostring(eview, pretty_print=True)
25- result = self._fix_size_bug(cr, uid, result, context=context)
26 return result

Subscribers

People subscribed via source and target branches