diff options
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/website.contentMenu.js | 11 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 6 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.contentMenu.xml | 12 |
3 files changed, 8 insertions, 21 deletions
diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js index 01deb49977c..315eb88de21 100644 --- a/addons/website/static/src/js/website.contentMenu.js +++ b/addons/website/static/src/js/website.contentMenu.js @@ -306,7 +306,6 @@ var EditMenuDialog = widget.Dialog.extend({ }); var MenuEntryDialog = widget.LinkDialog.extend({ - template: 'website.contentMenu.dialog.add', init: function (editor, data) { data.text = data.name || ''; data.isNewWindow = data.new_window; @@ -315,10 +314,11 @@ var MenuEntryDialog = widget.LinkDialog.extend({ }, start: function () { var self = this; - var result = $.when(this._super.apply(this, arguments)).then(function () { - if (self.data) { - self.bind_data(); - } + + this.$(".link-style").remove(); + this.$("label[for=link-new]").text("Menu Label"); + + return $.when(this._super.apply(this, arguments)).then(function () { var $link_text = self.$('#link-text').focus(); self.$('#link-page').change(function (e) { if ($link_text.val()) { return; } @@ -327,7 +327,6 @@ var MenuEntryDialog = widget.LinkDialog.extend({ $link_text.focus(); }); }); - return result; }, save: function () { var $e = this.$('#link-text'); 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) { diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml index d6b1fe40b72..2baf4252bf3 100644 --- a/addons/website/static/src/xml/website.contentMenu.xml +++ b/addons/website/static/src/xml/website.contentMenu.xml @@ -58,16 +58,4 @@ </div> </t> </t> -<t t-name="website.contentMenu.dialog.add" t-extend="web_editor.dialog.link"> - <t t-jquery="t[t-set='title']" t-operation="inner"> - <t t-if="!widget.update_mode">Add Menu Entry</t> - <t t-if="widget.update_mode">Edit Menu Entry</t> - </t> - <t t-jquery="form > div.form-horizontal" t-operation="replace"/> - <t t-jquery="form > div.list-group:first label" t-operation="replace"> - <label for="link-new" class="control-label"> - Menu Label - </label> - </t> -</t> </templates> |