Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-urls-mail-reply-chm into lp:openerp-web/7.0

  1. 7.0-urls-mail-reply-chm
  2. Merge into 7.0
Proposed by Thibault Delavallée (OpenERP)
Status: Rejected
Rejected by: Thibault Delavallée (OpenERP)
Proposed branch: lp:~openerp-dev/openerp-web/7.0-urls-mail-reply-chm
Merge into: lp:openerp-web/7.0
Diff against target: 11 lines (+1/-0)
1 file modified
addons/web/static/src/js/views.js (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-urls-mail-reply-chm
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+159341@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openerp-web/7.0-urls-mail-reply-chm updated
3890. By Thibault Delavallée (OpenERP)

[MERGE] Sync with 7

Revision history for this message
Thibault Delavallée (OpenERP) (tde-openerp) wrote :

Forward ported into trunk.

Unmerged revisions

3890. By Thibault Delavallée (OpenERP)

[MERGE] Sync with 7

3889. By Thibault Delavallée (OpenERP)

[MERGE] Sync with 7.0

3888. By Christophe Matthieu (OpenERP)

[IMP] view: add state into params for actions

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/views.js'
2--- addons/web/static/src/js/views.js 2013-03-22 16:23:10 +0000
3+++ addons/web/static/src/js/views.js 2013-04-18 11:32:24 +0000
4@@ -241,6 +241,7 @@
5 } else if (state.active_id) {
6 add_context.active_ids = [state.active_id];
7 }
8+ add_context.params = state;
9 this.null_action();
10 action_loaded = this.do_action(state.action, { additional_context: add_context });
11 $.when(action_loaded || null).done(function() {