diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-29 13:12:53 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-29 13:12:53 +0200 |
| commit | aa578e1bee460b0a6e1fda2fd3b570ca32e36244 (patch) | |
| tree | 325c0d8a18ee084ffe630dfd3d8a1a956585a54d | |
| parent | af6328c2a24ad3829d430dc5a415bcde6ce48883 (diff) | |
| parent | 4d4ff7c5e7982285f2137e6f1a1ca8d2bc569d27 (diff) | |
[MERGE] forward port branch 9.0 up to 4d4ff7c5e79
| -rw-r--r-- | addons/web/static/src/js/apps.js | 7 | ||||
| -rw-r--r-- | doc/reference/views.rst | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/addons/web/static/src/js/apps.js b/addons/web/static/src/js/apps.js index 520fb3210c4..d210a21187e 100644 --- a/addons/web/static/src/js/apps.js +++ b/addons/web/static/src/js/apps.js @@ -61,7 +61,7 @@ var Apps = Widget.extend({ }, destroy: function() { - $(window).off("message.apps"); + $(window).off("message." + this.uniq); if (this.$ifr) { this.$ifr.remove(); this.$ifr = null; @@ -160,10 +160,11 @@ var Apps = Widget.extend({ qs.debug = session.debug; } var u = $.param.querystring(client.origin + "/apps/embed/client", qs); - var css = {width: '100%', height: '400px'}; + var css = {width: '100%', height: '750px'}; self.$ifr = $('<iframe>').attr('src', u); - $(window).on("message.apps", self.proxy('_on_message')); + self.uniq = _.uniqueId('apps'); + $(window).on("message." + self.uniq, self.proxy('_on_message')); self.on('message:ready', self, function(m) { var w = this.$ifr[0].contentWindow; diff --git a/doc/reference/views.rst b/doc/reference/views.rst index 1a8188f734c..9449fe15fd9 100644 --- a/doc/reference/views.rst +++ b/doc/reference/views.rst @@ -241,6 +241,11 @@ Possible children elements of the list view are: Makes the button ``invisible`` if the record is *not* in one of the listed states + + .. danger:: + + Using ``states`` in combination with ``attrs`` may lead to + unexpected results as domains are combined with a logical AND. ``context`` merged into the view's context when performing the button's Odoo call ``confirm`` |