diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-25 17:17:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-25 17:17:15 +0200 |
| commit | cfb0c0deadae316d9bbcae4d6d177a75f3dbbce4 (patch) | |
| tree | 961774158c47e97694ec1093f947262beaa0eef1 /addons/website/static/src/js/website.editor.js | |
| parent | 77d231546d252c3f83d54c18d75864a15bc09b24 (diff) | |
| parent | 7ae5121877aec43a19a447b9b9d6a37f4a5633c2 (diff) | |
[MERGE] forward port branch saas-11 up to 7ae5121
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 0ed17be589b..b62b6c2e6ac 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -163,11 +163,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 @@ -178,7 +178,7 @@ widget.LinkDialog.include({ }); } } else { - def.resolve(val, isNewWindow, label, classes); + return this._super.apply(this, arguments); } }, changed: function (e) { |
