diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-25 16:06:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-25 16:06:15 +0200 |
| commit | 7ae5121877aec43a19a447b9b9d6a37f4a5633c2 (patch) | |
| tree | 63eb72b47ce467bfba4df77a7df5d0da79e966e5 /addons/website/static/src/js/website.editor.js | |
| parent | c70e2a5777263d5e29430ffa7fa4519cfaff3048 (diff) | |
| parent | fc0f02305347ed46e8fdc7dd68188d17dc9b09a6 (diff) | |
[MERGE] forward port branch saas-10 up to fc0f023
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index b40c2deac9f..5dee57772ed 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -155,11 +155,11 @@ widget.LinkDialog.include({ } return this._super(); }, - get_data_buy_url: function (def, $e, isNewWindow, label, classes) { + get_data_buy_url: function (def, $e, isNewWindow, label, classes, test) { var val = $e.val(); if (val && val.length && $e.hasClass('page')) { var data = $e.select2('data'); - if (!data.create) { + if (!data.create || test) { def.resolve(data.id, isNewWindow, label || data.text, classes); } else { // Create the page, get the URL back @@ -170,7 +170,7 @@ widget.LinkDialog.include({ }); } } else { - def.resolve(val, isNewWindow, label, classes); + return this._super.apply(this, arguments); } }, changed: function (e) { |
