From 9795702fb148f6ac45b025fe0e8e454d7f3c81d5 Mon Sep 17 00:00:00 2001 From: Antoine Huvelle Date: Thu, 22 Dec 2011 14:03:17 +0100 Subject: [PATCH] [imp] modifications in view.js: giving 100% height to actionmanager bzr revid: ahu@openerp.com-20111222130317-8w6ba1044axpt1x8 --- addons/web/static/src/js/view_list.js | 7 +++---- addons/web/static/src/js/views.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 04f381b47c3..a5bee6438f0 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -215,6 +215,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# $(self.groups).trigger( 'selected', [selection.ids, selection.records]); }); + this.$element.find('.oe-list-add') .click(this.do_add_record) .attr('disabled', grouped && this.options.editable); @@ -233,7 +234,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# $this.append('') .siblings('.oe-sortable').find('span').remove(); } - + self.reload_content(); }); @@ -274,8 +275,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# self.reload_content(); }) .val(self._limit || 'NaN'); - }) - + }); if (!this.sidebar && this.options.sidebar && this.options.sidebar_id) { this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id); this.sidebar.start(); @@ -474,7 +474,6 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# page: this.page, limit: this._limit }); - return reloaded.promise(); }, diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 7e620e5fa4c..19600d93c15 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -27,7 +27,7 @@ session.web.ActionManager = session.web.Widget.extend({ this.client_widget = null; }, render: function() { - return "
"; + return "
"; }, dialog_stop: function () { if (this.dialog) {