summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Ledoux <dle@openerp.com>2014-04-09 18:02:14 +0200
committerDenis Ledoux <dle@openerp.com>2014-04-09 18:02:14 +0200
commit83996269cac6874a3ccd24bcdd440ec8b2f28bec (patch)
tree65398a6dd4de54450f8d847364f301f4b8d8da7d
parent3285feab53ccae8ed7e6abd0dc335145caff5102 (diff)
parent1e123f5be0eaf703ba2f3c9c4a4b6e61f4b351d1 (diff)
[FIX] pad: render_value binded on change effective_readonly event, so render value calls wait for each others
bzr revid: dle@openerp.com-20140409160214-1anxi8z07xj49vsp
-rw-r--r--addons/pad/static/src/js/pad.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index e04184bc8f7..d44ca07417a 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -25,7 +25,7 @@ openerp.pad = function(instance) {
self.$(".oe_unconfigured").toggle(!configured);
self.$(".oe_configured").toggle(configured);
});
- this.render_value();
+ this.on("change:effective_readonly", this, this.render_value);
},
render_value: function() {
var self = this;
@@ -36,9 +36,12 @@ openerp.pad = function(instance) {
var value = self.get('value');
if (self.get('effective_readonly')) {
if (_.str.startsWith(value, 'http')) {
+ self.$('.oe_pad_content').addClass('oe_pad_loading')
this.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) {
- self.$('.oe_pad_content').removeClass('oe_pad_loading').html('<div class="oe_pad_readonly"><div>');
- self.$('.oe_pad_readonly').html(data);
+ if (self.$('.oe_pad_loading').length) {
+ self.$('.oe_pad_content').removeClass('oe_pad_loading').html('<div class="oe_pad_readonly"><div>');
+ self.$('.oe_pad_readonly').html(data);
+ }
}).fail(function() {
self.$('.oe_pad_content').text(_t('Unable to load pad'));
});