From dc558a3291fd2edc0c9e6f94dc0025258f210d32 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 9 Apr 2012 21:43:33 +0200 Subject: [PATCH] fix reload view bzr revid: al@openerp.com-20120409194333-u82lb7ru2t395rmn --- addons/web/static/src/js/view_form.js | 15 ++++++++++++--- addons/web/static/src/js/view_list.js | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a6f0cb0928c..5f4bd19ad6c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -119,8 +119,12 @@ openerp.web.FormView = openerp.web.View.extend({ if (this.sidebar) { this.sidebar.$element.show(); } - this.$buttons.find('.oe_form_buttons').show(); - this.$pager.find('.oe_form_pager').show(); + if (this.$buttons) { + this.$buttons.find('.oe_form_buttons').show(); + } + if (this.$pager) { + this.$pager.find('.oe_form_pager').show(); + } this.$element.show().css('visibility', 'hidden'); this.$element.removeClass('oe_form_dirty'); return this.has_been_loaded.pipe(function() { @@ -143,7 +147,12 @@ openerp.web.FormView = openerp.web.View.extend({ if (this.sidebar) { this.sidebar.$element.hide(); } - this.$buttons.find('.oe_form_buttons').hide(); + if (this.$buttons) { + this.$buttons.find('.oe_form_buttons').hide(); + } + if (this.$pager) { + this.$pager.find('.oe_form_pager').hide(); + } this.$pager.find('.oe_form_pager').hide(); this._super(); }, diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 3869c248398..a5d95a4ec2e 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -234,6 +234,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# this.$element.find('.oe-list-add') .click(this.proxy('do_add_record')) .attr('disabled', grouped && this.options.editable); this.$element.find('.oe-list-delete') .attr('disabled', true) .click(this.proxy('do_delete_selected')); + // Pager this.$element.find('.oe-list-pager') .delegate('button', 'click', function () { var $this = $(this); @@ -272,6 +273,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# .val(self._limit || 'NaN'); }); + // Sidebar if (!this.sidebar && this.options.sidebar && this.options.$sidebar) { this.sidebar = new openerp.web.Sidebar(this); this.sidebar.appendTo(this.options.$sidebar);