Merge lp:~openerp-dev/openerp-web/trunk-bug-1241359-msh into lp:openerp-web

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of statusbar, statusbar widget doesn't update with new selection when field is type of selection, issue is due to latest changes in statubar widget which triggers get_selection only when domain changed, in the case of selection widget there is no need to trigger get_selection based on domain change.

Demo: Sale -> Create Sale Order -> Confirm It -> and then Cancel it, Cancel state not updated in statusbar.

Reason: get_selection not called, due to latest changes in statusbar get_selection is called only when there is a change in domain, this implementation is true if type of field is many2one, for selection type field this fails.

Thanks

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello,

This was already fixed in the saas-2 branch[1] (and forward ported to trunk). I will reject this one then.

Regards

[1] http://bazaar.launchpad.net/~openerp/openerp-web/saas-2/revision/3898

Unmerged revisions

3907. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-12-20

[FIX]Web: statusbar widget doesn't update with new selection when field is type of selection, issue is due to latest changes in statubar widget which triggers get_selection only when domain changed, in the case of selection widget there is no need to trigger get_selection based on domain change.

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-12-19 13:40:55 +0000
+++ addons/web/static/src/js/view_form.js	2013-12-20 09:21:45 +0000
@@ -5554,14 +5554,17 @@
     },
     calc_domain: function() {
         var d = instance.web.pyeval.eval('domain', this.build_domain());
-        var domain = []; //if there is no domain defined, fetch all the records
-
-        if (d.length) {
-            domain = ['|',['id', '=', this.get('value')]].concat(d);
-        }
-
-        if (! _.isEqual(domain, this.get("evaluated_selection_domain"))) {
-            this.set("evaluated_selection_domain", domain);
+        if (this.field.type == 'many2one') {
+            var domain = []; //if there is no domain defined, fetch all the records
+            if (d.length) {
+                domain = ['|',['id', '=', this.get('value')]].concat(d);
+            }
+    
+            if (! _.isEqual(domain, this.get("evaluated_selection_domain"))) {
+                this.set("evaluated_selection_domain", domain);
+            }
+        } else {
+            this.set("evaluated_selection_domain", ['|', ['id', '=', this.get('value')]].concat(d));
         }
     },
     /** Get the selection and render it