[MERGE] Forward-port saas-4 up to 5ceded9

1 files changed, 11 insertions, 0 deletions

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 16a6bd24edf..71432404f3a 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -25,6 +25,7 @@ from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 
 import werkzeug.urls
+from werkzeug.exceptions import NotFound
 
 from openerp import SUPERUSER_ID
 from openerp import http
@@ -175,6 +176,16 @@ class website_event(http.Controller):
             'event': event,
             'main_object': event
         }
+
+        if '.' not in page:
+            page = 'website_event.%s' % page
+
+        try:
+            request.website.get_template(page)
+        except ValueError, e:
+            # page not found
+            raise NotFound
+
         return request.website.render(page, values)
 
     @http.route(['/event/<model("event.event"):event>'], type='http', auth="public", website=True)