[MERGE] forward port branch 10.0 up to 6466aa4

1 files changed, 5 insertions, 4 deletions

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 0826ac839d7..3a64816a248 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -262,10 +262,10 @@ class Website(Home):
 
     @http.route('/website/customize_template_get', type='json', auth='user', website=True)
     def customize_template_get(self, key, full=False, bundles=False):
-        """ Get inherit view's informations of the template ``key``. By default, only
-            :returns ``customize_show`` templates (which can be active or not), if
-                ``full=True`` returns inherit view's informations of the template ``key``.
-                ``bundles=True`` returns also the asset bundles
+        """ Get inherit view's informations of the template ``key``.
+            returns templates info (which can be active or not)
+            ``full=False`` returns only the customize_show template
+            ``bundles=True`` returns also the asset bundles
         """
         return request.env["ir.ui.view"].customize_template_get(key, full=full, bundles=bundles)
 
@@ -370,6 +370,7 @@ class Website(Home):
         ], type='http', auth="public", website=True)
     def actions_server(self, path_or_xml_id_or_id, **post):
         ServerActions = request.env['ir.actions.server']
+        action = action_id = None
 
         # find the action_id: either an xml_id, the path, or an ID
         if isinstance(path_or_xml_id_or_id, basestring) and '.' in path_or_xml_id_or_id: