diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-11-25 19:13:43 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-11-25 19:13:43 +0100 |
| commit | 4b4a71c282b8a7f3739d01bef04a802d950ccffd (patch) | |
| tree | a8f4533907f7493791e299bec0d76b49c2834f0f /addons/web/static/src | |
| parent | f61cfaefc82313587aa66cd37c227c1687a31826 (diff) | |
| parent | 8f9194e8ea06f674d8111bc16f98c0ca687c0684 (diff) | |
[MERGE] forward port of branch saas-7 up to 8f9194e
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/boot.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_common.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/less/modal.less | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index 65cf45827a0..77115499b46 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -51,7 +51,6 @@ testing: typeof QUnit === "object", debug: debug, remaining_jobs: jobs, - version: "community", __DEBUG__: { get_dependencies: function (name, transitive) { diff --git a/addons/web/static/src/js/views/form_common.js b/addons/web/static/src/js/views/form_common.js index 3e31579826a..aaa39b225f6 100644 --- a/addons/web/static/src/js/views/form_common.js +++ b/addons/web/static/src/js/views/form_common.js @@ -993,6 +993,7 @@ var SelectCreateDialog = ViewDialog.extend({ } 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); 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) { @@ -1012,7 +1013,7 @@ var SelectCreateDialog = ViewDialog.extend({ 'import_enabled': false, '$buttons': self.$footer, 'disable_editable_mode': true, - '$pager': self.$('.o_popup_list_pager'), + 'pager': true, }, self.options.list_view_options || {})); self.view_list.on('edit:before', self, function (e) { e.cancel = true; @@ -1020,6 +1021,7 @@ var SelectCreateDialog = ViewDialog.extend({ self.view_list.popup = self; self.view_list.appendTo(self.$el).then(function() { self.view_list.do_show(); + self.view_list.render_pager($pager); }).then(function() { if (self.options.initial_facet) { self.searchview.query.reset([self.options.initial_facet], { diff --git a/addons/web/static/src/less/modal.less b/addons/web/static/src/less/modal.less index 784fb47aaf8..6635dbaf1f5 100644 --- a/addons/web/static/src/less/modal.less +++ b/addons/web/static/src/less/modal.less @@ -11,7 +11,10 @@ .o_modal_header { .o-webclient-padding(@top: 10px, @bottom: 10px); - .o_popup_list_pager { // FIXME : should check where it is used (o_modal_header ~= control panel) + .o_search_options { + display: inline-block; + } + .o_pager { float: right; } } |