diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-04-11 14:32:07 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-04-11 14:32:07 +0200 |
| commit | b6ff5848b0ec8f9f90fb5aee7d7b78eba674aeec (patch) | |
| tree | 88d1102151311a557b2a289424e458cb18bd0dcd | |
| parent | cf1a395cbf4b5c132742515be741898fe8593c17 (diff) | |
[FIX] Use parent element id for form header
bzr revid: fme@openerp.com-20110411123207-q3ka2w9qg7z7n4jp
| -rw-r--r-- | addons/base/static/src/js/form.js | 14 | ||||
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 69185628ffb..0eec8c79ebb 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -49,10 +49,10 @@ openerp.base.FormView = openerp.base.Controller.extend( /** @lends openerp.base self.on_pager_action(action); }); - this.$element.find('div.oe_form_buttons button.oe_form_button_save').click(this.do_save); - this.$element.find('div.oe_form_buttons button.oe_form_button_save_edit').click(this.do_save_edit); - this.$element.find('div.oe_form_buttons button.oe_form_button_cancel').click(this.do_cancel); - this.$element.find('div.oe_form_buttons button.oe_form_button_new').click(this.on_button_new); + this.$element.find('#' + this.element_id + '_header button.oe_form_button_save').click(this.do_save); + this.$element.find('#' + this.element_id + '_header button.oe_form_button_save_edit').click(this.do_save_edit); + this.$element.find('#' + this.element_id + '_header button.oe_form_button_cancel').click(this.do_cancel); + this.$element.find('#' + this.element_id + '_header button.oe_form_button_new').click(this.on_button_new); // sidebar stuff if (this.view_manager.sidebar) { @@ -116,10 +116,10 @@ openerp.base.FormView = openerp.base.Controller.extend( /** @lends openerp.base this.dataset.read_index(_.keys(this.fields_view.fields), this.on_record_loaded); }, do_update_pager: function(hide_index) { - var $pager = this.$element.find('div.oe_form_pager'); + var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager').eq(0); var index = hide_index ? '-' : this.dataset.index + 1; - this.$element.find('span.oe_pager_index').html(index); - this.$element.find('span.oe_pager_count').html(this.dataset.count); + $pager.find('span.oe_pager_index').html(index); + $pager.find('span.oe_pager_count').html(this.dataset.count); }, do_onchange: function(widget, processed) { processed = processed || []; diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index caf463cf4e0..57f9c81559e 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -224,7 +224,7 @@ </tr> <t t-name="FormView"> <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2> - <div class="oe_form_header"> + <div class="oe_form_header" t-att-id="view.element_id + '_header'"> <div class="oe_form_buttons"> <!--<button type="button" class="oe_form_button_save">Save</button>--> <button type="button" class="oe_form_button_save_edit">Save & Edit</button> |