Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/6.1-opw-581723-cpa into lp:openerp-web/6.1

  1. 6.1-opw-581723-cpa
  2. Merge into 6.1
Proposed by Chirag Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/6.1-opw-581723-cpa
Merge into: lp:openerp-web/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
addons/web/static/src/js/search.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/6.1-opw-581723-cpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+133642@code.launchpad.net

Description of the change

Hello,

Remove group field from advanced filter.

Demo : Settings > Users > users
1) Add Advanced Filter.
2) In advanced filter field selection display groups field.

Observed: Select one group field and search will gives an error.
Expected: In advanced filter field selection should not display groups field like gtk-client.

Thanks.

To post a comment you must log in.

Unmerged revisions

2480. By Chirag Patel (OpenERP)

[FIX] Fixed remove group field from advanced filter.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/search.js'
2--- addons/web/static/src/js/search.js 2012-06-29 12:18:05 +0000
3+++ addons/web/static/src/js/search.js 2012-11-09 10:43:04 +0000
4@@ -1228,7 +1228,7 @@
5 this._super(parent);
6 this.fields = _(fields).chain()
7 .map(function(val, key) {return _.extend({}, val, {'name': key}); })
8- .filter(function(field){return typeof field.store === 'undefined' || field.store || field.fnct_search})
9+ .filter(function(field){return (typeof field.store === 'undefined' || field.store || field.fnct_search) && (field.selectable)})
10 .sortBy(function(field) {return field.string;})
11 .value();
12 this.attrs = {_: _, fields: this.fields, selected: null};