Merge lp:~openerp-dev/openobject-client-web/6.0-opw-5796-sma into lp:openobject-client-web

Proposed by Sananaz (Open ERP)
Status: Merged
Merged at revision: 4630
Proposed branch: lp:~openerp-dev/openobject-client-web/6.0-opw-5796-sma
Merge into: lp:openobject-client-web
Diff against target: 13 lines (+2/-2)
1 file modified
addons/openerp/static/javascript/form.js (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client-web/6.0-opw-5796-sma
Reviewer Review Type Date Requested Status
Navrang Oza (community) Needs Resubmitting
Xavier (Open ERP) (community) Needs Fixing
Review via email: mp+61388@code.launchpad.net

Description of the change

Hello,

To generate problem:
- open a sale order line in a sale order
- you can't open the m2o fields (product_id or product_uom)

If can't generate problem please clear your browser cache.

Thank you.

To post a comment you must log in.
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

The '/' prefix was added at the same time the conditional above was modified to add a 'split' in it.

I'm pretty sure if we go through conditional, things are going to break because there will not be a final '/' and so we'll get `somefield_terp_model` instead of `somefield/_terp_model`.

I think we need to leave it before `_terp_model` but remove adding of trailing '/' in original creation of `prefix`. What do you think?

review: Needs Fixing
4619. By Xavier (Open ERP)

[FIX] make substring search on m2o fields (without popping up the m2o search) significantly more reliable, thanks Stefan

4620. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4621. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4622. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4623. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4624. By Navrang Oza

[FIX] Syntax errors were not handled properly.

4625. By Navrang Oza

[FIX] Removed unnecessary comma (,) to avoide IE issue. (OPW-5969).

Revision history for this message
Navrang Oza (noz-tiny) wrote :

@xmo, You are right, we should not add '/' in prefix if we are going to remove after words.

As sma is not here so I made changes in her branch and resubmitting here.

review: Needs Resubmitting
4626. By Navrang Oza

[FIX] Import : Web client adds an extra seperated line [] and sends to server, which turns into crash at server failing to read data within the line.

4627. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4628. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4629. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

4630. By Navrang Oza

[FIX] m2m contextmenu doesn't appear in o2m popup.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/static/javascript/form.js'
2--- addons/openerp/static/javascript/form.js 2011-06-01 04:54:40 +0000
3+++ addons/openerp/static/javascript/form.js 2011-06-01 07:32:37 +0000
4@@ -802,8 +802,8 @@
5 function makeContextMenu(id, kind, relation, val){
6 var act = get_form_action('get_context_menu');
7
8- var prefix = id.indexOf('/') > -1 ? id.slice(0, id.lastIndexOf('/')) + '/' : '';
9- if ((prefix.split('/')[0])== '_terp_listfields') {
10+ var prefix = id.indexOf('/') > -1 ? id.slice(0, id.lastIndexOf('/')) : '';
11+ if ((prefix.split('/')[0]) == '_terp_listfields') {
12 prefix = (prefix.split('/')[1]);
13 }
14