From 68ccb8492ee84adea1ca8c7ab39a70be7cd88c5b Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 19 May 2011 16:23:34 +0200 Subject: [PATCH] [FIX] Fix custom ListViews bzr revid: fme@openerp.com-20110519142334-no2gq2dxf3avo1va --- addons/base/static/src/js/form.js | 3 ++- addons/base/static/src/js/list.js | 4 ++++ addons/base/static/src/xml/base.xml | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 7ec270b19d2..cb3744d420c 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -29,6 +29,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV this.ready = false; this.show_invalid = true; this.touched = false; + this.flags = view_manager.action.flags || {}; }, start: function() { //this.log('Starting FormView '+this.model+this.view_id) @@ -41,7 +42,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV var frame = new openerp.base.form.WidgetFrame(this, this.fields_view.arch); - this.$element.html(QWeb.render("FormView", { "frame": frame, "view": this })); + this.$element.html(QWeb.render("FormView", { 'frame': frame, 'view': this })); _.each(this.widgets, function(w) { w.start(); }); diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js index 8261725cf72..3723cf77c92 100644 --- a/addons/base/static/src/js/list.js +++ b/addons/base/static/src/js/list.js @@ -54,6 +54,10 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi this.rows = []; this.options = _.extend({}, this.defaults, options || {}); + this.flags = {}; + if (view_manager && view_manager.action) { + this.flags = view_manager.action.flags; + } this.list = new openerp.base.ListView.List({ options: this.options, diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 8ec3501dd75..e124441c19d 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -159,7 +159,7 @@ - + @@ -239,13 +239,13 @@

-
+
-
+