diff options
| author | Martin Trigaux <mat@odoo.com> | 2015-12-01 10:54:51 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2015-12-01 10:54:51 +0100 |
| commit | 87f96c942ab4381b489db5b6bf5de959f0ec3d7f (patch) | |
| tree | e9302d09e1fce1d4544e7fa92d4465105ded0140 /addons/web/static/src/js/views | |
| parent | d025251c7e4ee4c26462e61b5d63e5c5d58689f8 (diff) | |
| parent | 90254beedbb6a9bdf055ae582af866073eab4f2c (diff) | |
[MERGE] forward port of branch saas-7 up to 90254bee
Diffstat (limited to 'addons/web/static/src/js/views')
| -rw-r--r-- | addons/web/static/src/js/views/form_common.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/form_common.js b/addons/web/static/src/js/views/form_common.js index aaa39b225f6..80342f42ee8 100644 --- a/addons/web/static/src/js/views/form_common.js +++ b/addons/web/static/src/js/views/form_common.js @@ -992,8 +992,8 @@ var SelectCreateDialog = ViewDialog.extend({ this.searchview.destroy(); } var $header = $('<div/>').addClass('o_modal_header').appendTo(this.$el); - var $buttons = $('<div/>').addClass('o_search_options').appendTo($header); var $pager = $('<div/>').addClass('o_pager').appendTo($header); + var $buttons = $('<div/>').addClass('o_search_options').appendTo($header); this.searchview = new SearchView(this, this.dataset, false, search_defaults, {$buttons: $buttons}); this.searchview.on('search_data', self, function(domains, contexts, groupbys) { if (self.initial_ids) { diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js index 86ae1790632..cb6daf093ce 100644 --- a/addons/web/static/src/js/views/list_view.js +++ b/addons/web/static/src/js/views/list_view.js @@ -1177,7 +1177,7 @@ ListView.List = Class.extend( /** @lends instance.web.ListView.List# */{ ids = value; } new Model(column.relation) - .call('name_get', [ids, this.dataset.context]).done(function (names) { + .call('name_get', [ids, this.dataset.get_context()]).done(function (names) { // FIXME: nth horrible hack in this poor listview record.set(column.id + '__display', _(names).pluck(1).join(', ')); |