Merge lp:~openerp-dev/openerp-web/6.1-opw-586024-ado into lp:openerp-web/6.1

[Amit Dodiya (OpenERP)]

Hello,

"[BACKPORT] web-client gives object error while opening the list view of system parameter if we write comma in product name"

Steps:
1). Login as admin and install stock module
2). Make sure you're using the extended interface
3). Create a new product with the name "test 1,2"
Now goto "Settings -> Configuration -> Parameters -> Configuration Parameters", you will get object error.

Code is back-ported from 7.0

Regards,
Amit Dodiya

Unmerged revisions

2502. By Amit Dodiya (OpenERP) on 2013-02-08

[BACKPORT] web-client gives object error while opening the list view of system parameter if we write comma in product name

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2012-06-25 07:20:46 +0000
+++ addons/web/static/src/js/view_list.js	2013-02-08 08:57:26 +0000
@@ -907,7 +907,7 @@
             // set) a human-readable version. m2o does not have this issue
             // because the non-human-readable is just a number, where the
             // human-readable version is a pair
-            if (value && (ref_match = /([\w\.]+),(\d+)/.exec(value))) {
+            if (value && (ref_match = /^([\w\.]+),(\d+)$/.exec(value))) {
                 // reference values are in the shape "$model,$id" (as a
                 // string), we need to split and name_get this pair in order
                 // to get a correctly displayable value in the field