Skip to content
Snippets Groups Projects
Commit aa578e1b authored by Christophe Simonis's avatar Christophe Simonis
Browse files

[MERGE] forward port branch 9.0 up to 4d4ff7c5

parents af6328c2 4d4ff7c5
Branches
Tags
No related merge requests found
......@@ -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;
......
......@@ -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``
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment