Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-survey-chm into lp:openerp-web

  1. trunk-survey-chm
  2. Merge into trunk
Proposed by Christophe Matthieu (OpenERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openerp-web/trunk-survey-chm
Merge into: lp:openerp-web
Diff against target: 26 lines (+4/-1)
2 files modified
addons/web/static/src/js/view_form.js (+1/-1)
addons/web/static/src/js/views.js (+3/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-survey-chm
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+147939@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openerp-web/trunk-survey-chm updated
3683. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3684. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3685. By Christophe Matthieu (OpenERP)

[IMP] view_form: option no_resize for textarea

3686. By Christophe Matthieu (OpenERP)

[MERGE] from trunk 3699

3687. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3688. By Christophe Matthieu (OpenERP)

[IMP] view.js: clean diff

3689. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3690. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3691. By Christophe Matthieu (OpenERP)

[FIX] view_form: FieldStatus, fix on_click_stage with non integer values

3692. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

Unmerged revisions

3692. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3691. By Christophe Matthieu (OpenERP)

[FIX] view_form: FieldStatus, fix on_click_stage with non integer values

3690. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3689. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3688. By Christophe Matthieu (OpenERP)

[IMP] view.js: clean diff

3687. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3686. By Christophe Matthieu (OpenERP)

[MERGE] from trunk 3699

3685. By Christophe Matthieu (OpenERP)

[IMP] view_form: option no_resize for textarea

3684. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

3683. By Christophe Matthieu (OpenERP)

[MERGE] from trunk

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/view_form.js'
2--- addons/web/static/src/js/view_form.js 2013-04-15 10:30:41 +0000
3+++ addons/web/static/src/js/view_form.js 2013-04-23 15:20:36 +0000
4@@ -5443,7 +5443,7 @@
5 on_click_stage: function (ev) {
6 var self = this;
7 var $li = $(ev.currentTarget);
8- var val = parseInt($li.data("id"));
9+ var val = _.isNaN(+$li.data("id")) ? $li.data("id") : parseInt($li.data("id"));
10 if (val != self.get('value')) {
11 this.view.recursive_save().done(function() {
12 var change = {};
13
14=== modified file 'addons/web/static/src/js/views.js'
15--- addons/web/static/src/js/views.js 2013-04-05 11:09:00 +0000
16+++ addons/web/static/src/js/views.js 2013-04-23 15:20:36 +0000
17@@ -241,6 +241,9 @@
18 } else if (state.active_id) {
19 add_context.active_ids = [state.active_id];
20 }
21+ if (state.params) {
22+ add_context.params = state.params;
23+ }
24 this.null_action();
25 action_loaded = this.do_action(state.action, { additional_context: add_context });
26 $.when(action_loaded || null).done(function() {