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

[Priyank Pandya(OpenERP Trainee)]

It uses the filter icon even you use the functionality of group by,
so change the image according to functionality.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

1. This does not check that there is a groupby in the context, only that there is a context (incorrect, you can have a context with no groupby)
2. This issue should be handled by GroupbyGroup, if the icon is incorrect then there is a problem in dispatching between FilterGroup and GroupbyGroup, *this* is the bug which should be fixed.

review: Disapprove

[Priyank Pandya(OpenERP Trainee) (priyank.pandya-openerp)]

hi xavier
     As per your suggestion I further investigate issue and found that there is not(never) created GroupbyGroup instance for group by filter due to f.attrs.context && f.attrs.context.group_by line:977 here we get f.attrs.context.group_by as 'undefined'
     Here is improve condition to fix this issue. correct me if I missing something

thanks

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Not correct: the original code broke because code was merged to remove context evaluation from server side, so before attrs.context was a dict (or undefined) and inside maybe there was group_by key. Now attrs.context is a string so can not have group_by key, need to parse attrs.context as python dictionary and then check if there is group_by key. Just checking if there is group_by means filters which are not for grouping will also get configured as grouping, which is not valid.

Fix has already been pushed to 7.0 branch.

Unmerged revisions

3683. By Priyank Pandya(OpenERP Trainee) on 2013-03-11

[IMP] group by filter icon: create GroupbyGroup instance for group by instade of FilterGroup

3682. By Priyank Pandya(OpenERP Trainee) on 2013-03-06

[merge] with web

3681. By Priyank Pandya(OpenERP Trainee) on 2013-02-12

[FIX] web : advanced search - wrong group icon

=== modified file 'addons/web/static/src/js/search.js'
--- addons/web/static/src/js/search.js	2013-02-27 14:12:09 +0000
+++ addons/web/static/src/js/search.js	2013-03-11 05:47:22 +0000
@@ -974,7 +974,7 @@
         // create a GroupbyGroup instead of the current FilterGroup
         if (!(this instanceof instance.web.search.GroupbyGroup) &&
               _(filters).all(function (f) {
-                  return f.attrs.context && f.attrs.context.group_by; })) {
+                  return f.attrs.context})) {
             return new instance.web.search.GroupbyGroup(filters, view);
         }
         this._super(view);