diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-05-19 16:23:34 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-05-19 16:23:34 +0200 |
| commit | 68ccb8492ee84adea1ca8c7ab39a70be7cd88c5b (patch) | |
| tree | a584c66ff3f0449cfdfdc617af490e99e960281b /addons/base/static/src | |
| parent | ff6e1e6b868beffd73e37102628a4b532bb1d91b (diff) | |
[FIX] Fix custom ListViews
bzr revid: fme@openerp.com-20110519142334-no2gq2dxf3avo1va
Diffstat (limited to 'addons/base/static/src')
| -rw-r--r-- | addons/base/static/src/js/form.js | 3 | ||||
| -rw-r--r-- | addons/base/static/src/js/list.js | 4 | ||||
| -rw-r--r-- | 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 @@ <tr t-if="options.selectable"> <th t-if="actions_span" t-att-colspan="actions_span" class="oe-actions"> - <t t-if="view_manager.action.flags.action_buttons !== false"> + <t t-if="flags.action_buttons !== false"> <button type="button" id="oe-list-add" t-if="options.addable"> <t t-esc="options.addable"/> @@ -172,7 +172,7 @@ </th> <th t-att-colspan="columns_count - actions_span" class="oe-list-pager"> - <t t-if="view_manager.action.flags.pager !== false"> + <t t-if="flags.pager !== false"> <button type="button" data-pager-action="first">First</button> <button type="button" data-pager-action="previous" ><<</button> @@ -239,13 +239,13 @@ <t t-name="FormView"> <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2> <div class="oe_form_header" t-att-id="view.element_id + '_header'"> - <div class="oe_form_buttons" t-if="view.view_manager.action.flags.action_buttons !== false"> + <div class="oe_form_buttons" t-if="view.flags.action_buttons !== false"> <!--<button type="button" class="oe_form_button_save">Save</button>--> <button type="button" class="oe_form_button_save_edit">Save & Edit</button> <!--<button type="button" class="oe_form_button_cancel">Cancel</button>--> <button type="button" class="oe_form_button_new">New</button> </div> - <div class="oe_form_pager" t-if="view.view_manager.action.flags.pager !== false"> + <div class="oe_form_pager" t-if="view.flags.pager !== false"> <button type="button" data-pager-action="first">First</button> <button type="button" data-pager-action="previous"><<</button> |