X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fwebsite%2Fcontrollers%2Fmain.py;h=22ec7f1fd02f003c79e2df931e81d74f6fb93029;hb=fd4fd35e3239c771ab9d692f47f61770ae882965;hp=5d908671a8929e4e9293b7f7ce0dcb92237b7d19;hpb=c4b1b58ffa7d0a0fb73dd98ee5a58b6c97af9451;p=odoo%2Fodoo.git

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 5d90867..22ec7f1 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -40,8 +40,7 @@ class Website(openerp.addons.web.controllers.main.Home):
                 if not (first_menu.url.startswith(('/page/', '/?', '/#')) or (first_menu.url=='/')):
                     return request.redirect(first_menu.url)
                 if first_menu.url.startswith('/page/'):
-                    page = first_menu.url[6:]
-
+                    return request.registry['ir.http'].reroute(first_menu.url)
         return self.page(page)
 
     @http.route(website=True, auth="public")
@@ -192,14 +191,19 @@ class Website(openerp.addons.web.controllers.main.Home):
         modules_to_update = []
         for temp_id in templates:
             view = request.registry['ir.ui.view'].browse(request.cr, request.uid, int(temp_id), context=request.context)
+            if view.page:
+                continue
             view.model_data_id.write({
                 'noupdate': False
             })
             if view.model_data_id.module not in modules_to_update:
                 modules_to_update.append(view.model_data_id.module)
-        module_obj = request.registry['ir.module.module']
-        module_ids = module_obj.search(request.cr, request.uid, [('name', 'in', modules_to_update)], context=request.context)
-        module_obj.button_immediate_upgrade(request.cr, request.uid, module_ids, context=request.context)
+
+        if modules_to_update:
+            module_obj = request.registry['ir.module.module']
+            module_ids = module_obj.search(request.cr, request.uid, [('name', 'in', modules_to_update)], context=request.context)
+            if module_ids:
+                module_obj.button_immediate_upgrade(request.cr, request.uid, module_ids, context=request.context)
         return request.redirect(redirect)
 
     @http.route('/website/customize_template_get', type='json', auth='user', website=True)
@@ -413,7 +417,7 @@ class Website(openerp.addons.web.controllers.main.Home):
             action = ServerActions.browse(cr, uid, action_id, context=context)
             if action.state == 'code' and action.website_published:
                 action_res = ServerActions.run(cr, uid, [action_id], context=context)
-                if isinstance(action_res, Response):
+                if isinstance(action_res, werkzeug.wrappers.Response):
                     res = action_res
         if res:
             return res