Merge lp:~openerp-dev/openobject-addons/trunk-bug-944761-amp into lp:openobject-addons

[Amit Parik]

Fixes the unicode problem on my task view which is created from fields_view_get

This view doesn't open in other languages (i.e French,Italian ) without demo data.

This fix will solved this problem.

Thanks!

[Olivier Dony (Odoo) (odo-openerp)]

FYI, the fix was applied in 6.1 at revision 6767. But I don't think it was a good idea to hardcode unicode('utf-8').
The safer way to accomplish this is to use tools.ustr() which will behave properly in case the parameter is already unicode. It could happen if someone else inherits fields_view_get and converts res['arch'] to unicode upstream, for instance. This is our standard technique to coerce anything to unicode.

Thanks!

review: Needs Fixing

[Amit Parik (amit-parik)]

Hello Olivier,

I have used the tools.ustr()instead of unicode utf-8 directly as you suggested, So please check it again!

Thanks for the suggestion!

review: Needs Resubmitting

[Olivier Dony (Odoo) (odo-openerp)]

Looks ok to me now

review: Approve

=== modified file 'project_gtd/project_gtd.py'
--- project_gtd/project_gtd.py	2011-12-21 22:15:04 +0000
+++ project_gtd/project_gtd.py	2012-05-02 13:38:24 +0000
@@ -115,7 +115,7 @@
                 search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'user_invisible': True}"/>\n'''
             search_extended +='''<separator orientation="vertical"/>'''
 
-            res['arch'] = res['arch'].replace('<separator name="gtdsep"/>', search_extended)
+            res['arch'] = tools.ustr(res['arch']).replace('<separator name="gtdsep"/>', search_extended)
 
         return res