diff options
| author | Martin Trigaux <mat@odoo.com> | 2015-12-21 11:37:53 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2015-12-21 11:37:53 +0100 |
| commit | e4bf03aeaf2c8200164c27f0d93994e2c173bded (patch) | |
| tree | abce75b917f931d042dba1e34060efd625f90ed7 /addons/web/static/src/js | |
| parent | 82a495eed52a9f42e5b88caa52c20a85f8d81ce3 (diff) | |
| parent | c298cf3250fcfa351775dc57c3b913169e30e418 (diff) | |
[MERGE] Forward port of branch saas-7 up to c298cf3
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/action_manager.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_relational_widgets.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js index b5353a8e7d2..4110e45ba83 100644 --- a/addons/web/static/src/js/action_manager.js +++ b/addons/web/static/src/js/action_manager.js @@ -500,7 +500,7 @@ var ActionManager = Widget.extend({ res_model: state.model, res_id: state.id, type: 'ir.actions.act_window', - views: [[false, 'form']] + views: [[_.isNumber(state.view_id) ? state.view_id : false, 'form']] }; action_loaded = this.do_action(action); } else if (state.sa) { diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js index a4e900c6636..bc6bcb0ca57 100644 --- a/addons/web/static/src/js/views/form_relational_widgets.js +++ b/addons/web/static/src/js/views/form_relational_widgets.js @@ -1431,7 +1431,7 @@ var FieldMany2ManyTags = AbstractManyField.extend(common.CompletionFieldMixin, c get_render_data: function(ids){ var self = this; return this.mutex.exec(function(){ - var fields = self.fields.color ? ['name', 'color'] : ['name']; + var fields = self.fields.color ? ['display_name', 'name', 'color'] : ['display_name', 'name']; // TODO master: remove useless 'name' return self.dataset.read_ids(ids, fields); }); }, |