summaryrefslogtreecommitdiff
path: root/addons/pad/static/src
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-09-21 01:53:43 +0200
committerAntony Lesuisse <al@openerp.com>2012-09-21 01:53:43 +0200
commit283131289d8cccd1f05acb262dfc19cf27a2b539 (patch)
tree4538feca71972ef9cbdd53083cdaca5f418ec59b /addons/pad/static/src
parenteafe3416291a08d114d75d2e8259590070889eac (diff)
parentf154707dcb6bcecfb978a37104a3fdeb2a71194d (diff)
[MERGE] note: remove optionals tags, pad: fix lazy pad creation
bzr revid: al@openerp.com-20120920235343-tveo33j410atkt2y
Diffstat (limited to 'addons/pad/static/src')
-rw-r--r--addons/pad/static/src/js/pad.js14
1 files changed, 10 insertions, 4 deletions
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index b7c13ba1b89..e598ecca4f5 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -16,10 +16,17 @@ instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
var self = this;
var _super = self._super;
_super.apply(self,[val]);
+
if (val === false || val === "") {
- self.field_manager.dataset.call('pad_generate_url').then(function(r) {
- _super.apply(self,[r]);
- self.render_value();
+ self.field_manager.dataset.call('pad_generate_url',{context:{
+ model: self.field_manager.model,
+ field_name: self.name,
+ object_id: self.field_manager.datarecord.id
+ }}).then(function(data) {
+ if(data&&data.url){
+ _super.apply(self,[data.url]);
+ self.render_value();
+ }
});
} else {
self.render_value();
@@ -27,7 +34,6 @@ instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
this._dirty_flag = true;
},
render_value: function() {
- console.log("display");
var self = this;
var value = this.get('value');