From ca0537ad4ae41065a43d1e8d549a63e8393c2d27 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Nov 2013 16:57:04 +0100
Subject: [PATCH] [FIX] menu entry dialog to work correctly with select2 page
 picker

bzr revid: xmo@openerp.com-20131113155704-7l0d87va0860h7dx
---
 addons/website/static/src/js/website.editor.js |  2 +-
 addons/website/static/src/js/website.menu.js   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 245abd9960e..22367e24d47 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -863,7 +863,7 @@
                         rs.push({
                             create: true,
                             id: q.term,
-                            text: "Create " + q.term,
+                            text: _.str.sprintf(_t("Create page '%s'"), q.term),
                         });
                         q.callback({
                             more: false,
diff --git a/addons/website/static/src/js/website.menu.js b/addons/website/static/src/js/website.menu.js
index 04da43cefa2..85392f55edd 100644
--- a/addons/website/static/src/js/website.menu.js
+++ b/addons/website/static/src/js/website.menu.js
@@ -160,11 +160,11 @@
                     self.bind_data(self.data.name, self.data.url, self.data.new_window);
                 }
                 var $link_text = self.$('#link-text').focus();
-                self.$('#link-existing').change(function () {
-                    if (!$link_text.val()) {
-                        $link_text.val($(this).find('option:selected').text());
-                        $link_text.focus();
-                    }
+                self.$('#link-page').change(function (e) {
+                    if ($link_text.val()) { return; }
+                    var data = $(this).select2('data');
+                    $link_text.val(data.create ? data.id : data.text);
+                    $link_text.focus();
                 });
             });
         },