Merge lp:~openerp-dev/openerp-web/7.0-bug-1096832-vja into lp:openerp-web/7.0

[Vishmita Jadeja (openerp)]

Hello,

     Field name in the notification should be consistent with field label in the form.

Thanks.

[Fabien Meghazi (OpenERP) (fme)]

You have to check the existence of f.$label before chaining to .text()

field.$label is not always set, see line 1227 of the same file.

review: Needs Fixing

Unmerged revisions

3709. By Vishmita Jadeja (openerp) on 2013-01-22

[Fix]Field name in the notification should be consistent with field label in the form

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-01-07 16:18:07 +0000
+++ addons/web/static/src/js/view_form.js	2013-01-22 06:40:52 +0000
@@ -863,7 +863,7 @@
             .filter(function (f) { return !f.is_valid(); })
             .map(function (f) {
                 return _.str.sprintf('<li>%s</li>',
-                    _.escape(f.string));
+                    _.escape(f.$label.text() || f.string));
             }).value();
         warnings.unshift('<ul>');
         warnings.push('</ul>');