diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-07-28 13:56:16 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-07-28 13:56:16 +0200 |
| commit | 97073e2a7352c158ae03698437fdda9b1e9bf657 (patch) | |
| tree | bd840aa03f1a25ff942328814223aea7375a79ed /addons/web/static/src/js/views/form_view.js | |
| parent | f1099a6598fc7381ac43af41a13f44b3e7a62874 (diff) | |
| parent | 51040b6d60eac7a055321b5c33481bb7c4488295 (diff) | |
[MERGE] forward port of branch saas-6 up to 51040b6
Diffstat (limited to 'addons/web/static/src/js/views/form_view.js')
| -rw-r--r-- | addons/web/static/src/js/views/form_view.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js index fd22b2e9ce4..2ec8864cfd9 100644 --- a/addons/web/static/src/js/views/form_view.js +++ b/addons/web/static/src/js/views/form_view.js @@ -142,7 +142,7 @@ var FormView = View.extend(common.FieldManagerMixin, { // Add bounce effect on button 'Edit' when click on readonly page view. this.$el.find(".oe_form_group_row,.oe_form_field,label,h1,.oe_title,.oe_notebook_page, .oe_list_content").on('click', function (e) { - if(self.get("actual_mode") == "view" && self.$buttons) { + if(self.get("actual_mode") == "view" && self.$buttons && !$(e.target).is('[data-toggle]')) { var $button = self.$buttons.find(".oe_form_button_edit"); $button.openerpBounce(); e.stopPropagation(); |