From 44af6d1e09aa3bec6967ac3eb4e67b3e9215fb08 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 26 Nov 2013 17:01:48 +0100
Subject: [IMP] significantly improve handling of trying to create a new page
 which already exists

# Through the menu

Rather than output a generic error (500 due to an IntegrityError),
return a templated 409 letting the user either visit the
page-which-already-exists-with-the-name-he'd-picked or open the page
creation dialog again for a second round.

An alternative would be to promote the website.prompt use to
full-blown dialog as a result of selecting "New Page" and handle the
"page already exists" case without even closing the dialog.

# Through the link dialog

Added an RPC call to check if a page already exists (essentially a
cheaper version of opening /page/whatever and checking whether it's a
200 over JSON-RPC), if the page matching the completion term already
exists, do *not* add the choice of creating the page, only provide
completions from existing pages.

bzr revid: xmo@openerp.com-20131126160148-wrk4zvz9istscwa0
---
 addons/website/static/src/xml/website.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/xml/website.xml')

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index b35dd8a9cfc..d5368ec7b94 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -72,16 +72,21 @@
                         <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
                         <div class="h2"><t t-esc="title"/></div>
                     </div>
-                    <div class="modal-body">
+                    <div class="modal-body" t-if="message or backend_url">
                         <section>
                             <t t-esc="message"/>
                         </section>
-                        <section class="mt32">
-                            You have encountered an error. You can edit in the <a t-att-href="backend_url">backend</a> this data.
+                        <section class="mt32" t-if="backend_url">
+                            <p>The web site has encountered an error.</p>
+                            <p>
+                                It might be possible to edit the relevant items
+                                or fix the issue in <a t-href="#{backend_url}">
+                                the classic OpenERP interface</a>.
+                            </p>
                         </section>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" data-dismiss="modal" href="#" class="close btn btn-default">Close</button>
+                        <button type="button" data-dismiss="modal" class="btn btn-primary">Close</button>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3