Merge lp:~openerp-dev/openerp-web/7.0-opw-587802-rha into lp:openerp-web/7.0

[Rifakat Husen (OpenERP)]

When widget=statusbar is used on any field, domain over statusbar was not properly handled.
It adds '|' even if the domain contains only one element. '|' should only be added when there is second/another element.

Reproduce:
In module fleet,
1. Fleet > Vehicles > Vehicles, click on the menu
2. click on the vehicle name from kanban and it will throw an error

File "/home/rha/workspace/openerp/7.0/server/openerp/osv/expression.py", line 202, in normalize_domain
    assert expected == 0, 'This domain is syntactically not correct: %s' % (domain)
AssertionError: This domain is syntactically not correct: ['|', ['id', '=', False]]

Fix: put a check whether there is another content to add and then apply '|'

Thanks for the review,
Rifakat Haradwala

[Csaba TOTH (tsabi)]

This was fixed in another was in rev 3840

Unmerged revisions

3840. By Rifakat Husen (OpenERP) on 2013-03-14

[FIX] fix issue for the statusbar domain,
it puts '|' whithout checking the second domain existance, needs to check whether there is another
domain or not and if yes then apply OR

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-03-13 10:17:56 +0000
+++ addons/web/static/src/js/view_form.js	2013-03-14 09:28:19 +0000
@@ -5335,7 +5335,7 @@
     },
     calc_domain: function() {
         var d = instance.web.pyeval.eval('domain', this.build_domain());
-        domain = ['|', ['id', '=', this.get('value')]].concat(d);
+        domain = !_.isEmpty(d)? ['|', ['id', '=', this.get('value')]].concat(d) : [['id', '=', this.get('value')]];
         if (! _.isEqual(domain, this.get("evaluated_selection_domain"))) {
             this.set("evaluated_selection_domain", domain);
         }