Merge lp:~openerp-dev/openerp-web/7.0-opw-597162-acl into lp:openerp-web/7.0

Proposed by Anaël Closson (openerp)
Status: Merged
Merged at revision: 4027
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-597162-acl
Merge into: lp:openerp-web/7.0
Diff against target: 25 lines (+2/-2)
2 files modified
addons/web/static/src/js/data.js (+1/-1)
addons/web/static/src/js/view_form.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-597162-acl
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, test Approve
OpenERP Core Team Pending
Review via email: mp+184512@code.launchpad.net

Description of the change

Please see related lp bug : https://bugs.launchpad.net/openerp-web/+bug/1217374

Install test addons from Alexandre Fayolle (opw_addon2.tgz file), and get to menus "Partner" and "Test" in Configuration section. Though it should be working, first one doesn't without the patch.
Previously made patch worked but added a regression that makes the "Partner" subsection not working.

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

works fine.

Thanks Anaël.

review: Approve (code review, test)

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/data.js'
2--- addons/web/static/src/js/data.js 2013-06-07 15:23:26 +0000
3+++ addons/web/static/src/js/data.js 2013-09-09 08:12:24 +0000
4@@ -432,7 +432,7 @@
5 // TODO: reorder results to match ids list
6 return this._model.call('read',
7 [ids, fields || false],
8- {context: this._model.context(options.context)});
9+ {context: this.get_context(options.context)});
10 },
11 /**
12 * Read a slice of the records represented by this DataSet, based on its
13
14=== modified file 'addons/web/static/src/js/view_form.js'
15--- addons/web/static/src/js/view_form.js 2013-08-21 08:53:42 +0000
16+++ addons/web/static/src/js/view_form.js 2013-09-09 08:12:24 +0000
17@@ -2934,7 +2934,7 @@
18 values.push({
19 label: _t("Search More..."),
20 action: function() {
21- dataset.name_search(search_val, self.build_domain(), 'ilike', false).done(function(data) {
22+ dataset.name_search(search_val, self.build_domain(), 'ilike', 160).done(function(data) {
23 self._search_create_popup("search", data);
24 });
25 },